Schema et Entités ENCORE mis à jour
Merge branch 'master' of https://github.com/merildev/cpedev

Conflicts:
	Sources/GesProj_JPA/src/META-INF/project.xml
Merge branch 'master' of https://github.com/merildev/cpedev