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/Command/AdminUpdatePasswordCommand.php

@@ -32,7 +32,6 @@ use Thelia\Core\Event\TheliaEvents;
 use Thelia\Model\AdminQuery;
 use Thelia\Tools\Password;
 
-
 /**
  * command line for updating admin password
  *
@@ -72,18 +71,15 @@ class AdminUpdatePasswordCommand extends ContainerAwareCommand
     {
         $login = $input->getArgument('login');
 
-
         if (null === $admin = AdminQuery::create()->filterByLogin($login)->findOne()) {
             throw new \RuntimeException(sprintf('Admin with login %s does not exists', $login));
         }
 
-
         $password = $input->getOption('password') ?: Password::generateRandom();
 
         $event = new AdministratorUpdatePasswordEvent($admin);
         $event->setPassword($password);
 
-
         $this->
             getContainer()
             ->get('event_dispatcher')
@@ -99,4 +95,3 @@ class AdminUpdatePasswordCommand extends ContainerAwareCommand
     }
 
 }
-