Change to Grails 2.2.1
Add thehyve repo so that at least the default master branch compiles - even though using Rmodules inline is recommended at this time
Merge remote-tracking branch 'refs/remotes/github/master' into ImperialBranch

Conflicts:
	application.properties