ajout de la nav barre
Merge branch 'master' into v2

Conflicts:
	index.html