push de mercredi soir
Merge pull request #57 from garzgul/Gael

push de mercredi soir
Merge pull request #58 from garzgul/Eddy

merge de mercredi soir
Merge origin/Mourad into gael

conflits resolus
Conflicts:
	src/java/bean/metier/AcheteurGestion.java
	src/java/servlet/Controleur.java
	web/WEB-INF/compte/inscriptionacheteur.jsp
Merge pull request #59 from garzgul/gael

Gael
Merge pull request #60 from garzgul/master

merge de mercredi soir