update to version 2.1.2 snapshot
update to 2.1.2
version 2.1.3
update to 2.1.4
update version to 2.1.5 build snapshot
update version
Merge branch '2.1.x' into 2.2.x

Conflicts:
	TomcatGrailsPlugin.groovy
	application.properties
	grails-app/conf/BuildConfig.groovy