GRAILS-9611 Fix CachingLinkGenerator bug when grails.serverURL isn't set
Improve GRAILS-9611 Fix: only do special handling if link is absolute
One more improvement for GRAILS-9611 Fix
Upgraded AspectJ Version
Upgraded JUnit Version
solution for GRAILS-8652 "classes lose their mixins during unit tests"
fix for "Using @Testfor without @Mock requires @Before annotation on setUp method"
Merge branch '2.1.x' into 2.2.x

Conflicts:
	grails-core/src/main/groovy/org/codehaus/groovy/grails/commons/GrailsClassUtils.java
	grails-web/src/main/groovy/org/codehaus/groovy/grails/web/mapping/DefaultLinkGenerator.groovy
Merge branch '2.2.x'

Conflicts:
	grails-web/src/main/groovy/org/codehaus/groovy/grails/web/mapping/DefaultLinkGenerator.groovy
Merge pull request #291 from bobbywarner/aspectjVersion

Upgraded AspectJ Version
GRAILS-9621 added support for configuring clientAuth and configurable truststores
Use Gradle 1.1

This is an intermediary step as Gradle 1.3 is out.  I am just getting off of the RC here and we will look at the larger upgrade later.
GRAILS-7811 - fix schema-export
Merge branch '2.1.x' into 2.2.x

Conflicts:
	gradle/wrapper/gradle-wrapper.properties
Merge branch '2.2.x'
GRAILS-9626 fixed imports of Spring resource classes to the new Grails resource classes
remove @Override from interface method impl
Merge branch '2.1.x' into 2.2.x
Merge branch '2.2.x'
need to use database-migration plugin 1.2.1 in 2.2+ because of http://jira.grails.org/browse/GPDATABASEMIGRATION-109