Plugin version updates
Database Migration was updated again
Merge pull request #307 from bobbywarner/2.1.x

Plugin version updates
Merge branch '2.1.x' into 2.2.x

Conflicts:
	gradle/assemble.gradle
	grails-resources/src/grails/templates/maven/app.pom
Merge branch '2.2.x'