Merge origin/Gael into Gael

Conflicts:
	src/java/bean/acheteur/Acheteur.java
Merge pull request #81 from garzgul/Gael

Merge origin/Gael into Gael