Revert "Revert "Merge branch 'cleanmaster' into modules""

This reverts commit b3ac365b45.

Conflicts:
	Readme.md
	core/lib/Thelia/Controller/Admin/AbstractCrudController.php
	core/lib/Thelia/Core/Template/Assets/AssetManagerInterface.php
	core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
	core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
	core/lib/Thelia/Core/Template/TemplateDefinition.php
	core/lib/Thelia/Model/Base/Coupon.php
	core/lib/Thelia/Model/Base/CouponQuery.php
	core/lib/Thelia/Model/Base/CouponVersion.php
	core/lib/Thelia/Model/Base/CouponVersionQuery.php
	core/lib/Thelia/Model/Base/OrderCouponQuery.php

core/lib/Thelia/Tests/Model/Message.php

@@ -23,7 +23,6 @@
 
 namespace Thelia\Tests\Model;
 
-
 use Thelia\Model\ConfigQuery;
 use Symfony\Component\Filesystem\Filesystem;
 use Thelia\Model\Message;
@@ -324,8 +323,8 @@ class MessageTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals("TEXT Layout 6: TEXT <template> & content v=my-value", $instance->getChildren()[0]->getBody());
     }
 
-    protected function tearDown() {
-
+    protected function tearDown()
+    {
         $dir = TemplateHelper::getInstance()->getActiveMailTemplate()->getAbsolutePath();
 
         ConfigQuery::write('active-mail-template', $this->backup_mail_template);