Merge origin/Gael into Gael

Conflicts:
	src/java/bean/acheteur/Acheteur.java