RedactIntrigue - Find best places last commit
Merge branch 'master' of https://github.com/larpomatic/gnk into jaccou_n

Conflicts:
	grails-app/controllers/org/gnk/publication/PublicationController.groovy
	grails-app/controllers/org/gnk/resplacetime/GenericPlaceController.groovy
	grails-app/views/redactIntrigue/_placesForm.gsp
	web-app/js/redactIntrigue/genericPlace.js
Merge branch 'master' of https://github.com/larpomatic/gnk into jaccou_n

Conflicts:
	grails-app/controllers/org/gnk/publication/PublicationController.groovy
	grails-app/controllers/org/gnk/resplacetime/GenericPlaceController.groovy
	grails-app/views/redactIntrigue/_placesForm.gsp
	web-app/js/redactIntrigue/genericPlace.js