refactor benchmark generator
Merge branch 'master' into storagecleanup

Conflicts:
	benchmark/generator/src/main/java/org/jumbodb/benchmark/generator/DataCollectionGenerator.java