stupid thing
Merge branch 'master' into eliutt-branch

Conflicts:
	Database Management System/Database.cpp