Merge branch 'master' of github.com:Stratio/queries-spark-benchmark
Merge branch 'master' of github.com:Stratio/queries-spark-benchmark

Conflicts:
	src/main/java/com/stratio/deep/Bench.java
	src/main/java/com/stratio/deep/benchmark/cassandra/hadoop/CassandraDriver.java
	src/main/java/com/stratio/deep/benchmark/hbase/spark/HbaseDriver.java