Merge branch 'master' into loops

Conflicts:
	core/lib/Thelia/Core/Template/Loop/Category.php
	core/lib/Thelia/Core/Template/Loop/FeatureValue.php
	core/lib/Thelia/Core/Template/Loop/Folder.php
	core/lib/Thelia/Core/Template/Loop/Product.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
	install/faker.php

documentation/api/files/Log/AbstractTlogDestination.php.txt

@@ -38,7 +38,7 @@ abstract class AbstractTlogDestination
     {
         $this->_configs = array();
         $this->_logs = array();
-        
+
         // Initialiser les variables de configuration
          $this->_configs = $this->getConfigs();