Merge remote-tracking branch 'origin/new-cassandra-backend' into new-cassandra-backend

Conflicts:
	CONTRIBUTORS.txt

CONTRIBUTORS.txt

@@ -189,5 +189,9 @@ James Pulec, 2015/04/19
 Alexander Lebedev, 2015/04/25
 Frantisek Holop, 2015/05/21
 Feanil Patel, 2015/05/21
+<<<<<<< HEAD
 Juan Rossi, 2015/08/10
-Piotr Maślanka, 2015/08/24
+Piotr Maślanka, 2015/08/24
+=======
+Piotr Maślanka, 2015/08/24
+>>>>>>> origin/new-cassandra-backend