Merge branch 'master' into m1
Updated project to use officially released GR8 CRM plugins
Merge branch 'm1' into m2

Conflicts:
	grails-app/conf/BuildConfig.groovy
Updated project to use officially released GR8 CRM plugins