Merged database into Tests
Merged master into Tests
Merge branch 'database' into Tests
Fixed compilation errors and faulty tests won't run
Merged frontend into Tests
Merge branch 'Tests' of github.com:utwente-di/di18