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

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