2.1.4.BUILD-SNAPSHOT
Merge branch '2.1.x' of github.com:grails-plugins/grails-tomcat-plugin into 2.1.x

Conflicts:
	TomcatGrailsPlugin.groovy
	application.properties
2.1.6.BUILD-SNAPSHOT