Fix conflict (part1)
Merge branch 'master' of https://github.com/assyll/BiblioJ_JEE.git

Conflicts:
	BiblioJ_JEE/grails-app/controllers/biblioj_jee/LivreController.groovy
	BiblioJ_JEE/grails-app/views/livre/list.gsp
	BiblioJ_JEE/target-eclipse/classes/.gitignore
	BiblioJ_JEE/target-eclipse/classes/biblioj_jee/AuteurController.class
	BiblioJ_JEE/target-eclipse/classes/biblioj_jee/AuteurControllerTests.class
	BiblioJ_JEE/target-eclipse/classes/biblioj_jee/Livre.class
	BiblioJ_JEE/target-eclipse/classes/biblioj_jee/LivreController.class
	BiblioJ_JEE/target-eclipse/classes/biblioj_jee/LivreControllerTests.class
	BiblioJ_JEE/target-eclipse/classes/biblioj_jee/LivreTests.class
	BiblioJ_JEE/target-eclipse/classes/biblioj_jee/ReservationController.class
	BiblioJ_JEE/target-eclipse/classes/biblioj_jee/ReservationControllerTests.class
	BiblioJ_JEE/target-eclipse/classes/biblioj_jee/TypedocController.class
	BiblioJ_JEE/target-eclipse/classes/biblioj_jee/TypedocControllerTests.class
	BiblioJ_JEE/target-eclipse/classes/biblioj_jee/UtilisateurController.class
	BiblioJ_JEE/target-eclipse/classes/biblioj_jee/UtilisateurControllerTests.class