no message
Merge branch 'master' of https://github.com/merildev/cpedev

Conflicts:
	Sources/GesProj_JPA/.classpath