Merge origin/Gael into Gael

Conflicts:
	src/java/bean/acheteur/Acheteur.java
Merge origin/master into gael

Conflicts:
	web/WEB-INF/main/Main.jsp
Merge pull request #77 from garzgul/gael

Gael