xhtml
Merge branch 'master' of github.com:merildev/cpedev

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