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
enable Cassandra tests on Travis CI
ensure unittest keyspace exists in local Cassandra before running tests
use cassandra-cli to create the keyspace
Merge remote-tracking branch 'origin/3.x'
fix gorm-cassandra test failures
execute GORMS tests in parallel by using Travis build matrix feature
remove _JAVA_OPTIONS workaround since Travis Oracle JDK7 has been downgraded back to 7u60
fix Travis build, wait for Cassandra startup
Merge remote-tracking branch 'origin/3.x'
closing the <code> tag
Merge remote-tracking branch 'origin/master'