Merge branch 'Sophie' of https://github.com/utwente-di/di14 into Sophie
Removed DatabaseTest