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/Destination/TlogDestinationFile.php.txt

@@ -56,7 +56,7 @@ class TlogDestinationFile extends AbstractTlogDestination
                     if (! is_dir($dir)) {
                             mkdir($dir, 0777, true);
                     }
-                    
+
                     touch($file_path);
                     chmod($file_path, 0777);
             }