Merge branch 'QueryLang' into origin/ConstraintSolver

CMakeLists.txt

DataStructures/DiskHashTable/DiskHashTableTests.cpp

DataStructures/DiskHashTable/MMDiskHashTable.h

DataStructures/HashTable/HashTable.h

DataStructures/HashTable/HashTableTests.cpp

DataStructures/Vector/VectorTests.cpp

query/Ranker/Ranker.cpp

query/Ranker/Ranker.h

query/Ranker/Scorer.cpp

query/Ranker/Scorer.h

query/Ranker/Site.cpp

query/Ranker/Site.h

query/Ranker/tests/RankerTest.cpp

query/queryLanguage/QueryParser.cpp

query/queryLanguage/QueryParser.h

query/queryLanguage/tests/testQueryParser.cpp