Merge branch 'dany/grails-project-view'