Merge remote-tracking branch 'origin/master'

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