MAJ des entités
Merge branch 'master' of https://github.com/merildev/cpedev

Conflicts:
	Sources/GesProj_EAR/.project
	Sources/GesProj_JPA/src/model/Activity.java
	Sources/GesProj_JPA/src/model/Conversation.java
	Sources/GesProj_JPA/src/model/Employee.java
	Sources/GesProj_JPA/src/model/Message.java
	Sources/GesProj_JPA/src/model/Project.java