Add groovy version
Merge branch 'develop' into feature/grails_wip

Conflicts:
	application.properties