Merge branch 'master' of https://github.com/larpomatic/gnk into jaccou_n

Conflicts:
	grails-app/i18n/messages_fr.properties
	grails-app/views/layouts/main.gsp
Work on RedactIntrigue List View
Merge branch 'master' of https://github.com/larpomatic/gnk into jaccou_n