Merge branch 'master' of git@github.com:utwente-di/di20.git into dev

Conflicts:
	src/main/resources/Database.java
Merge branch 'master' of git@github.com:utwente-di/di20.git into dev
Merge branch 'dev' of git@github.com:utwente-di/di20.git into dev

Conflicts:
	src/main/resources/Database.java
added database test
fix the test, ironically