Merge branch 'cassandra' of github.com:paralk/grails-data-mapping
Merge branch '3.x'

Conflicts resolved using master version:
	grails-datastore-gorm-cassandra/build.gradle
	grails-datastore-gorm-cassandra/src/main/groovy/org/grails/datastore/gorm/cassandra/bean/factory/CassandraMappingContextFactoryBean.groovy
	grails-datastore-gorm-cassandra/src/test/groovy/org/grails/datastore/gorm/cassandra/plugin/support/CassandraSpringConfigurerSpec.groovy
	grails-plugins/cassandra/grails-app/conf/BuildConfig.groovy