fix tests
Merge branch 'tax'

Conflicts:
	core/lib/Thelia/Core/Template/Loop/ProductSaleElements.php