Merge origin/master
	Modif mineur header
Conflicts:
	view/structure/header.php