Merge branch 'eliutt-branch'

Conflicts:
Database Management System/Database.cpp
Database Management System/Database.h
Revert adc3e46..c8799f2

This rolls back to commit adc3e4670b35ffcd6498c12018eda387bb1c3e6b.
not needed -ER