Removed a conflict marker left after a merge from CHANGES.txt
Queries with partion keys will be accepted. This fixes issue #37 and issue #50
#37: Fix handling of escaped quotes in CqlWhereParser. The parser preserves types of literals - e.g. it is now possible to distinguish string literals from number literals in the generated AST. Throw error when filtering on incomplete partition key. Code cleanup, fixed a few warnings.
Merge pull request #207 from datastax/wip-37-pkolaczk-partition-key-in-where

Support partition keys in where
Fix error message on column conversion failure. Fixes #208.
Document global properties affecting connecting or querying in the "Connecting" section of the manual.
Added missing entry in CHANGES.txt for streaming demo. Fixes #115.
Resolve merge conflicts