Résolution conflits
Merge branch 'master' of https://github.com/merildev/cpedev

Conflicts:
	Sources/GesProj_EAR/EarContent/META-INF/gesprojDB-ds.xml
	Sources/GesProj_JPA/src/META-INF/persistence.xml
Merge branch 'master' of https://github.com/merildev/cpedev