Merge origin/Eddy into Gael

Conflicts:
	src/java/DAO/livre/LivreDAO.java
	src/java/bean/metier/LivreGestion.java