NVSimulator
Merge branch 'feature/nvm' of github.com:hyrise/hyrise into feature/nvm

Conflicts:
	build/bin/units_storage/Makefile