plop
Merge branch 'master' of https://github.com/fvaron/zencart_fr

Conflicts:
	includes/templates/template_default/common/tpl_main_page_lampesV4.php
link jpl