Ok pour les user
Merge branch 'master' of http://github.com/pinguet62/StackOverlow

Conflicts:
	grails-app/conf/BootStrap.groovy