Commit
merge
Merge branch 'master' of https://github.com/assyll/BiblioJ_JEE.git

Conflicts:
	BiblioJ_JEE/grails-app/conf/BootStrap.groovy