uppercase columns and improve contents + added benchmark script

replaced pipe with comma

replace comma with pipe
Merge branch 'feature/TPCCHQueries' of http://github.com/kateyy/hyrise into feature/TPCCHQueries

Conflicts:
	test/tpcch/tpccBenchmark.py