Merge branch 'refactor_action'

Conflicts:
	core/lib/Thelia/Action/Product.php
	core/lib/Thelia/Controller/Admin/CategoryController.php
	core/lib/Thelia/Controller/Admin/ProductController.php
	core/lib/Thelia/Controller/Admin/TemplateController.php

core/lib/Thelia/Model/Address.php

@@ -4,7 +4,7 @@ namespace Thelia\Model;
 
 use Propel\Runtime\Connection\ConnectionInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Thelia\Core\Event\AddressEvent;
+use Thelia\Core\Event\Address\AddressEvent;
 use Thelia\Core\Event\TheliaEvents;
 use Thelia\Model\Base\Address as BaseAddress;
 use Thelia\Model\AddressQuery;

core/lib/Thelia/Model/Attribute.php

@@ -5,7 +5,7 @@ namespace Thelia\Model;
 use Thelia\Model\Base\Attribute as BaseAttribute;
 use Propel\Runtime\Connection\ConnectionInterface;
 use Thelia\Core\Event\TheliaEvents;
-use Thelia\Core\Event\AttributeEvent;
+use Thelia\Core\Event\Attribute\AttributeEvent;
 
 class Attribute extends BaseAttribute {
 

core/lib/Thelia/Model/AttributeAv.php

@@ -3,7 +3,7 @@
 namespace Thelia\Model;
 
 use Thelia\Model\Base\AttributeAv as BaseAttributeAv;
-use Thelia\Core\Event\AttributeAvEvent;
+use Thelia\Core\Event\Attribute\AttributeAvEvent;
 use Propel\Runtime\Connection\ConnectionInterface;
 use Thelia\Core\Event\TheliaEvents;
 use Propel\Runtime\ActiveQuery\Criteria;

core/lib/Thelia/Model/CartItem.php

@@ -7,7 +7,7 @@ use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Thelia\Core\Event\TheliaEvents;
 use Thelia\Model\Base\CartItem as BaseCartItem;
 use Thelia\Model\ConfigQuery;
-use Thelia\Core\Event\CartEvent;
+use Thelia\Core\Event\Cart\CartEvent;
 use Thelia\TaxEngine\Calculator;
 
 class CartItem extends BaseCartItem

core/lib/Thelia/Model/Category.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Core\Event\CategoryEvent;
+use Thelia\Core\Event\Category\CategoryEvent;
 use Thelia\Model\Base\Category as BaseCategory;
 use Propel\Runtime\ActiveQuery\Criteria;
 use Thelia\Tools\URL;

core/lib/Thelia/Model/CategoryAssociatedContent.php

@@ -3,7 +3,7 @@
 namespace Thelia\Model;
 
 use Thelia\Model\Base\CategoryAssociatedContent as BaseCategoryAssociatedContent;
-use Thelia\Core\Event\CategoryAssociatedContentEvent;
+use Thelia\Core\Event\Category\CategoryAssociatedContentEvent;
 use Thelia\Core\Event\TheliaEvents;
 use Propel\Runtime\Connection\ConnectionInterface;
 

core/lib/Thelia/Model/Config.php

@@ -26,7 +26,7 @@ namespace Thelia\Model;
 use Thelia\Model\Base\Config as BaseConfig;
 use Propel\Runtime\Connection\ConnectionInterface;
 use Thelia\Core\Event\TheliaEvents;
-use Thelia\Core\Event\ConfigEvent;
+use Thelia\Core\Event\Config\ConfigEvent;
 
 class Config extends BaseConfig {
 

core/lib/Thelia/Model/Currency.php

@@ -6,7 +6,7 @@ use Propel\Runtime\Exception\PropelException;
 use Thelia\Model\Base\Currency as BaseCurrency;
 use Thelia\Core\Event\TheliaEvents;
 use Propel\Runtime\Connection\ConnectionInterface;
-use Thelia\Core\Event\CurrencyEvent;
+use Thelia\Core\Event\Currency\CurrencyEvent;
 
 class Currency extends BaseCurrency {
 

core/lib/Thelia/Model/Customer.php

@@ -17,7 +17,7 @@ use Propel\Runtime\Connection\ConnectionInterface;
 use Propel\Runtime\Propel;
 use Thelia\Model\Map\CustomerTableMap;
 use Thelia\Core\Security\Role\Role;
-use Thelia\Core\Event\CustomerEvent;
+use Thelia\Core\Event\Customer\CustomerEvent;
 
 /**
  * Skeleton subclass for representing a row from the 'customer' table.

core/lib/Thelia/Model/Feature.php

@@ -5,7 +5,7 @@ namespace Thelia\Model;
 use Thelia\Model\Base\Feature as BaseFeature;
 use Propel\Runtime\Connection\ConnectionInterface;
 use Thelia\Core\Event\TheliaEvents;
-use Thelia\Core\Event\FeatureEvent;
+use Thelia\Core\Event\Feature\FeatureEvent;
 
 class Feature extends BaseFeature {
 

core/lib/Thelia/Model/FeatureAv.php

@@ -5,7 +5,7 @@ namespace Thelia\Model;
 use Thelia\Model\Base\FeatureAv as BaseFeatureAv;
 use Thelia\Core\Event\TheliaEvents;
 use Propel\Runtime\Connection\ConnectionInterface;
-use Thelia\Core\Event\FeatureAvEvent;
+use Thelia\Core\Event\Feature\FeatureAvEvent;
 
 class FeatureAv extends BaseFeatureAv {
 

core/lib/Thelia/Model/Folder.php

@@ -2,7 +2,7 @@
 
 namespace Thelia\Model;
 
-use Thelia\Core\Event\FolderEvent;
+use Thelia\Core\Event\Folder\FolderEvent;
 use Thelia\Core\Event\TheliaEvents;
 use Thelia\Model\Base\Folder as BaseFolder;
 use Thelia\Tools\URL;

core/lib/Thelia/Model/Message.php

@@ -5,7 +5,7 @@ namespace Thelia\Model;
 use Thelia\Model\Base\Message as BaseMessage;
 use Propel\Runtime\Connection\ConnectionInterface;
 use Thelia\Core\Event\TheliaEvents;
-use Thelia\Core\Event\MessageEvent;
+use Thelia\Core\Event\Message\MessageEvent;
 
 class Message extends BaseMessage {
 

core/lib/Thelia/Model/Product.php

@@ -8,7 +8,7 @@ use Thelia\Tools\URL;
 use Thelia\TaxEngine\Calculator;
 use Propel\Runtime\Connection\ConnectionInterface;
 use Thelia\Core\Event\TheliaEvents;
-use Thelia\Core\Event\ProductEvent;
+use Thelia\Core\Event\Product\ProductEvent;
 use Propel\Runtime\ActiveQuery\Criteria;
 use Propel\Runtime\Propel;
 use Thelia\Model\Map\ProductTableMap;

core/lib/Thelia/Model/ProductAssociatedContent.php

@@ -4,7 +4,7 @@ namespace Thelia\Model;
 
 use Thelia\Model\Base\ProductAssociatedContent as BaseProductAssociatedContent;
 use Propel\Runtime\Connection\ConnectionInterface;
-use Thelia\Core\Event\ProductAssociatedContentEvent;
+use Thelia\Core\Event\Product\ProductAssociatedContentEvent;
 use Thelia\Core\Event\TheliaEvents;
 
 class ProductAssociatedContent extends BaseProductAssociatedContent {

core/lib/Thelia/Model/Template.php

@@ -4,7 +4,7 @@ namespace Thelia\Model;
 
 use Thelia\Model\Base\Template as BaseTemplate;
 use Propel\Runtime\Connection\ConnectionInterface;
-use Thelia\Core\Event\TemplateEvent;
+use Thelia\Core\Event\Template\TemplateEvent;
 use Thelia\Core\Event\TheliaEvents;
 
 class Template extends BaseTemplate