Cql3 branch

Merge CQL3 branch to master