Signed-off-by: Titiloss <Titiloss@Titiloss-PC>
Signed-off-by: ACER <ACER@PC-ACER5742G>
Merge branch 'master' of ssh://git@github.com/atef1987/pfe.git

Conflicts:
	gestion_suiviPI/.classpath
	gestion_suiviPI/ejbModule/META-INF/persistence.xml