Merge origin/Mourad into Emmanuelle

Conflicts:
	src/java/bean/metier/AcheteurGestion.java
	src/java/servlet/Controleur.java
	web/WEB-INF/compte/inscriptionacheteur.jsp
	web/WEB-INF/main/Main.jsp
commit avant le bordel d'Emma
Merge origin/Gael into Gael

Conflicts:
	src/java/servlet/Controleur.java
Merge pull request #101 from garzgul/Gael

merge mercredi midi