quedal
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	include/pages/accueil.inc.php