On approche de la fin. Fin? finfinfinfinfifnfinfinfinfinfi
Merge branch 'master' of https://github.com/merildev/cpedev

Conflicts:
	Sources/GesProj_JSF_Activites/src/managedBean/ActivitySubmitBean.java
Merge branch 'master' of https://github.com/merildev/cpedev