fixed untracked files
Merge branch 'master' of https://github.com/merildev/cpedev

Conflicts:
	Sources/GesProj_EAR/EarContent/META-INF/gesprojDB-ds.xml
	Sources/GesProj_EJB/bin/.gitignore
	Sources/GesProj_EJB/bin/.settings/org.eclipse.wst.common.component
	Sources/GesProj_JPA/src/META-INF/persistence.xml
Correction 2989595956

Signed-off-by: Méril <meril.pilon@gmail.com>
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