product loop
Merge branch 'master' of github.com:thelia/thelia
loop arguments
product loop
Merge branch 'master' of github.com:thelia/thelia

Conflicts:
	core/lib/Thelia/Core/Template/Loop/Category.php
	core/lib/Thelia/Core/Template/Loop/Product.php