Merge branch 'more_data_structures' of dbgit.prakinf.tu-ilmenau.de:code/nvm-based_data_structures into more_data_structures

Conflicts:
	CMakeLists.txt
	src/utils/PatriciaUtils.hpp
	test/BaseTrieTest.cpp
	test/CMakeLists.txt
	test/PatriciaTest.cpp