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

Conflicts:
	src/main/java/di20/rooster/DatabaseTest.java