Merge branch 'customer'

Conflicts:
	core/lib/Thelia/Core/Template/Loop/Category.php
	core/lib/Thelia/Model/Customer.php
	templates/smarty-sample/index.html

core/lib/Thelia/Model/Customer.php

@@ -3,6 +3,7 @@
 namespace Thelia\Model;
 
 use Thelia\Model\Base\Customer as BaseCustomer;
+
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Thelia\Core\Event\CustomRefEvent;