Merge origin/Gael into Emmanuelle
Merge origin/master

Conflicts:
	src/java/servlet/Controleur.java
Merge origin/master

Conflicts:
	src/java/servlet/Controleur.java
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/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 branch 'master' 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 Emma mercredi matin
Merge branch 'Emmanuelle'