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
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