Refactoring to have multikey and standard hashing both available
Merge branch 'develop' into feature/sort_merge_join

Conflicts:
	HashingMethods/hybrid/hybridHashing.cpp
Reorganizing code between hybridHashing and multikeyHybridHashing, hybridHashing must be reviewed
Removing cityHash...
Implemented sort merge join
Removing FindCityHash.cmake
Merge branch 'feature/sort_merge_join' into develop