Updated READMEs (JAVA-158)
small improvements
formatting for the Upgrade guide
typonazi
Merge pull request #157 from al3xandru/reldocs-2.0

2.0 release docs
Merge pull request #158 from al3xandru/typos-2.0

typonazi
Nits
Always return the PrepararedStatement object that is cached internally

JAVA-263 #fixes
Merge branch '1.0' into 2.0

Conflicts:
	driver-core/src/main/java/com/datastax/driver/core/Cluster.java
	driver-core/src/main/java/com/datastax/driver/core/Session.java
	driver-core/src/main/java/com/datastax/driver/core/SessionManager.java
Fix race when multiple connect are done in parallel

JAVA-261 #fixes
Merge branch '1.0' into 2.0

Conflicts:
	driver-core/src/main/java/com/datastax/driver/core/Cluster.java