Mise en place de la navigation
Merge branches 'master' and 'master' of https://github.com/merildev/cpedev

Conflicts:
	Sources/GesProj_JSF_Activites/WebContent/pages/admin.xhtml