Merge branch 'admin'

Conflicts:
	core/lib/Thelia/Admin/Controller/BaseAdminController.php
	core/lib/Thelia/Config/Resources/config.xml
	core/lib/Thelia/Core/Template/Element/BaseLoop.php
	core/lib/Thelia/Core/Template/Loop/Category.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/Model/Customer.php

@@ -6,11 +6,26 @@ use Thelia\Model\Base\Customer as BaseCustomer;
 
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+
 use Thelia\Core\Event\CustomRefEvent;
 use Thelia\Core\Event\TheliaEvents;
+use Thelia\Core\Security\User\UserInterface;
+
 use Propel\Runtime\Connection\ConnectionInterface;
 
-class Customer extends BaseCustomer {
+/**
+ * Skeleton subclass for representing a row from the 'customer' table.
+ *
+ *
+ *
+ * You should add additional methods to this class to meet the
+ * application requirements.  This class will only be generated as
+ * long as it does not already exist in the output directory.
+ *
+ * @package    propel.generator.Thelia.Model
+ */
+class Customer extends BaseCustomer implements UserInterface
+{
     /**
      * @var \Symfony\Component\EventDispatcher\EventDispatcherInterface
      */
@@ -97,4 +112,26 @@ class Customer extends BaseCustomer {
     {
         $this->dispatcher = $dispatcher;
     }
+
+    /**
+     * {@inheritDoc}
+     */
+
+    public function getUsername() {
+    	return $this->getEmail();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function eraseCredentials() {
+    	$this->setPassword(null);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getRoles() {
+    	return array(new Role('USER_CUSTOMER'));
+    }
 }