Updated to Grails 2.3.5
Merge branch 'master' of https://github.com/jdmr/castor

Conflicts:
	application.properties