Merge origin/master

Conflicts:
	src/java/servlet/Controleur.java
Merge branch 'master' into Eddy

Conflicts:
	src/java/DAO/livre/AuteurDAO.java
Merge origin/Emmanuelle into Gael
controleur commentaires
controleur commentaires
Merge branch 'master' into Eddy

Conflicts:
	src/java/DAO/livre/AuteurDAO.java
Merge branch 'master' into Eddy

Conflicts:
	src/java/DAO/livre/AuteurDAO.java
controleur commentaires
Merge origin/master

Conflicts:
	src/java/servlet/Controleur.java
merge Mardi PM Gael
Merge origin/Gael into Emmanuelle
controleur commentaires
Merge origin/Emmanuelle into Gael
Merge origin/master

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

Conflicts:
	src/java/servlet/Controleur.java
controleur commentaires
merge Mardi PM Gael
controleur commentaires
controleur commentaires
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