some edits
fixing
Merge branch 'master' of https://github.com/thesaladin/AnnonceEfficace

Conflicts:
	target/classes/org/arQam/AnnonceEfficace/Metier/Utilisateur.class