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
Merge origin/Emmanuelle

Conflicts:
	src/java/servlet/Controleur.java
	web/WEB-INF/main/Main.jsp
Merge origin/Emmanuelle

Conflicts:
	src/java/servlet/Controleur.java
	web/WEB-INF/main/Main.jsp