CQL for messages CF, update to users CF issue #14
Conflitcs resolved merge issue #14