Merge branch 'develop'
Ran grails upgrade command to upgrade to grails version 2.2.4
Removed compile errors
Replaced HSQLDB with H2 in DataSource