Etienne Roudeix
c0a4b8b987
Merge branch 'master' into rewrite
Conflicts:
core/lib/Thelia/Core/Template/Loop/Attribute.php
core/lib/Thelia/Core/Template/Loop/AttributeAvailability.php
core/lib/Thelia/Core/Template/Loop/AttributeCombination.php
core/lib/Thelia/Core/Template/Loop/Category.php
core/lib/Thelia/Core/Template/Loop/Content.php
core/lib/Thelia/Core/Template/Loop/Country.php
core/lib/Thelia/Core/Template/Loop/Currency.php
core/lib/Thelia/Core/Template/Loop/Feature.php
core/lib/Thelia/Core/Template/Loop/FeatureAvailability.php
core/lib/Thelia/Core/Template/Loop/FeatureValue.php
core/lib/Thelia/Core/Template/Loop/Folder.php
core/lib/Thelia/Core/Template/Loop/Image.php
core/lib/Thelia/Core/Template/Loop/Product.php
core/lib/Thelia/Core/Template/Loop/Title.php
core/lib/Thelia/Model/Tools/ModelCriteriaTools.php