UserStory controller
no message
Merge branch 'master' of https://github.com/BeerPoldet/eclair

Conflicts:
	grails-app/conf/BootStrap.groovy