Merge branch 'master' of https://github.com/thelia/thelia

Conflicts:
	core/lib/Thelia/Action/Category.php
	core/lib/Thelia/Action/Customer.php

core/lib/Thelia/Core/Event/ActionEvent.php

@@ -24,7 +24,7 @@
 namespace Thelia\Core\Event;
 
 use Symfony\Component\EventDispatcher\Event;
-use Symfony\Component\HttpFoundation\Request;
+use Thelia\Core\HttpFoundation\Request;
 use Thelia\Form\BaseForm;
 use Thelia\Core\Security\SecurityContext;
 /**