Merge remote-tracking branch 'origin/master'

Conflicts:
	MVC/vues/global/header.php