ENFIN C'EST RESOLU

Signed-off-by: Méril <meril.pilon@gmail.com>
Merge branch 'master' of https://github.com/merildev/cpedev

Conflicts:
	Sources/GesProj_JSF_Activites/src/managedBean/FormProjectBean.java