Merge branch 'master' into Eddy

Conflicts:
	src/java/DAO/livre/AuteurDAO.java