Update news, version in preparation for 1.2.15
Update changes and news file for 2.0.5 re-roll
Remove/update invalid sentences in CQL doc
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
	NEWS.txt
	build.xml
	debian/changelog