Typo (sorry Etienne)
Merge branch 'master' of https://github.com/thelia/thelia
Event harmonization with MRA
Merge branch 'master' of https://github.com/thelia/thelia

Conflicts:
	core/lib/Thelia/Core/Template/Loop/Config.php
	core/lib/Thelia/Core/Template/Loop/Product.php
	core/lib/Thelia/Tools/URL.php
Merge branch 'master' of https://github.com/thelia/thelia

Conflicts:
	core/lib/Thelia/Config/Resources/routing/front.xml
	templates/admin/default/assets/css/admin.less
	templates/admin/default/currencies.html
	templates/admin/default/general_error.html
	templates/admin/default/messages.html
	templates/admin/default/variables.html