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

@@ -0,0 +1,11 @@
+<?php
+
+namespace Thelia\Model;
+
+use Thelia\Model\Base\ProdutImage as BaseProdutImage;
+
+        class ProdutImage extends BaseProdutImage
+{
+
+}
+