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/Admin.php

@@ -2,8 +2,40 @@
 
 namespace Thelia\Model;
 
+use Thelia\Core\Security\User\UserInterface;
 use Thelia\Model\Base\Admin as BaseAdmin;
 
-class Admin extends BaseAdmin {
+/**
+ * Skeleton subclass for representing a row from the 'admin' 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 Admin extends BaseAdmin implements UserInterface
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function getUsername() {
+        return $this->getLogin();
+    }
 
+    /**
+     * {@inheritDoc}
+     */
+    public function eraseCredentials() {
+    	$this->setPassword(null);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getRoles() {
+    	return array(new Role('USER_ADMIN'));
+    }
 }