Merge branch 'master' into m1
Merge branch 'master' into m2
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
Merge branch 'm2' into m3

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