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/Model/FolderImageI18nQuery.php.txt

@@ -0,0 +1,22 @@
+<?php
+
+namespace Thelia\Model;
+
+use Thelia\Model\Base\FolderImageI18nQuery as BaseFolderImageI18nQuery;
+
+
+/**
+ * Skeleton subclass for performing query and update operations on the 'folder_image_i18n' table.
+ *
+ *
+ *
+ * You should add additional methods to this class to meet the
+ * application requirements.  This class will only be generated as
+ * long as it does not already exist in the output directory.
+ *
+ */
+class FolderImageI18nQuery extends BaseFolderImageI18nQuery
+{
+
+} // FolderImageI18nQuery
+