Set version to 1.2.0-SNAPSHOT
Merge branch 'b1.1' of github.com:datastax/spark-cassandra-connector

Conflicts:
	CHANGES.txt
Merge branch 'b1.1' of github.com:datastax/spark-cassandra-connector
Fixed link in documentation
Java API doc page improvements

Fixes #275
Merge pull request #273 from philipphoffmann/patch-1

Fixed link in documentation
Merge pull request #276 from datastax/issue-275

Java API doc page improvements
Update 7_java_api.md

Ninja fix doc link
Merge branch 'b1.1'

Conflicts:
	CHANGES.txt
Merge branch 'b1.1'
Merge branch 'b1.1' of github.com:datastax/spark-cassandra-connector
Prepare release 1.1.0-beta1.
Merge branch 'b1.1'
Merge branch 'b1.1' of github.com:datastax/spark-cassandra-connector

Conflicts:
	CHANGES.txt
Merge branch 'b1.1' of github.com:datastax/spark-cassandra-connector
Merge branch 'b1.1' of github.com:datastax/spark-cassandra-connector
Merge branch 'b1.1' of github.com:datastax/spark-cassandra-connector

Conflicts:
	README.md
Merge branch 'b1.1'
Merge branch 'b1.1' of github.com:datastax/spark-cassandra-connector

Conflicts:
	doc/7_java_api.md
Merge branch 'b1.1' of github.com:datastax/spark-cassandra-connector