Merge branch 'master' into Eddy

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

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

Conflicts:
	src/java/DAO/livre/AuteurDAO.java
merge Mardi PM Gael
Merge origin/Gael into Emmanuelle
Merge origin/master

Conflicts:
	src/java/servlet/Controleur.java