Merge branch 'master' of github.com:grails/grails-core
remove version from grails-wrapper.properties
refactor wrapper setup code
improve wrapper's groovy-all jar locating code
Merge branch '2.1.x'
update version to 2.1 rc1
Merge branch '2.1.x' of github.com:grails/grails-core into 2.1.x
Merge branch '2.1.x'

Conflicts:
	build.gradle
	grails-test-suite-uber/src/test/groovy/grails/util/GrailsUtilTests.java
fix pluginsFromSvn task for new repo
Merge branch '2.1.x'
respect supplied arguments related to grails console output
start filling in namespace support for services
use Map.withDefault
ignore configured dir
new script to create a POM for a project
Merge branch '2.1.x'
fix failing test
Merge branch '2.1.x'
finish upgrade to tomcat 7.0.27
Merge branch '2.1.x'