Merge remote-tracking branch 'origin/master' into admin

Conflicts:
	core/lib/Thelia/Admin/Controller/BaseAdminController.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
	core/lib/Thelia/Model/Admin.php
	core/lib/Thelia/Model/Customer.php

core/lib/Thelia/Admin/Controller/BaseAdminController.php

@@ -89,7 +89,4 @@ class BaseAdminController extends ContainerAware
     {
         return $this->getFormFactory()->createBuilder("form");
     }
-
-    protected function isGranted() {
-    }
-}
+}