Added Metadata Operator with documentation and tests
Merge pull request #188 from irruputuncu/master

Added MetaData Operator with docs and test
tpccTableLoadTest.cpp now looks less copy-paste like
Merge pull request #190 from kateyy/tpccTableLoadTest

refactored TpccTableLoadTest
adding Operations to GroupByScan
* >as< to specify the name of the resulting aggregation column
* >min< and >max< as new operators
* >distinct< option for count operator (naive distinct algorithm)
* unit test for empty tables
Merge pull request #152 from lordgeorg/groupby_ops

adding Operations to GroupByScan
* >as< to specify the name of the resulting aggregation column
* >min< and >max< as new operators
* >distinct< option for count operator (naive distinct algorithm)
* unit test for empty tables
Fixing load performance issues
Adds minor MVCC improvements
* adds insert performance regression test
* MVCC: If a row is inserted and deleted in the same Tx, it is now invisible to the Tx (as it should be) - fixes #172
* Remove TXManager::getLastCID() calls from loop in Store::Merge #181
* TXManager::commitTransaction should get complete context instead of commit id only - changed rollback as well #181
Adds basic logging functionality
Merge pull request #196 from hyrise/feature/load_fix

Fixing load performance issues
Fixes persistency defines
Merge pull request #194 from hyrise/feature/new_mvcc

Adds minor MVCC updates
gitignore
Merge branch 'master' into feature/logging

Conflicts:
	src/bin/perf_regression/InsertScan.cpp
Merge branch 'feature/logging' into feature/nvm

Conflicts:
	settings.mk.default
	src/lib/storage/Store.cpp
removes all NVRAM code if persistency is set to something else than NVRAM