#12 #8 add method et modification en hidden
Merge branch 'master' of https://github.com/Crixus/TravelBook

Conflicts:
	test/unit/travelbook/UserControllerTests.groovy
Resolution de conflict
Merge branch 'master' of https://github.com/Crixus/TravelBook
Merge branch 'master' of https://github.com/Crixus/TravelBook
Merge branch 'master' of https://github.com/Crixus/TravelBook

Conflicts:
	.classpath
	grails-app/conf/Config.groovy
	grails-app/controllers/travelbook/UserController.groovy
	test/unit/travelbook/TravelControllerTests.groovy
RESOLUTION DE CONFLICT