Merge branch 'master' into Mourad

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 mourad mercredi matin
Merge branch 'Mourad'