MDP
Merge branch 'master' of https://github.com/novalfi/gestion.git

Conflicts:
	Novalfi/src/META-INF/persistence.xml