JPA
Merge branch 'master' of https://github.com/MrNakata/GestionCommande

Conflicts:
	src/org/afpa59/mt/main/MainGestion.java