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

Conflicts:
	design/schema.sql
	src/main/java/di20/rooster/Database.java
	src/main/java/di20/rooster/DatabaseTest.java
cleanup
REST start
settings
Merge branch 'master' into dev

Conflicts:
	src/main/java/di20/rooster/Database.java
untested add staff method
employee list page
employee list page
auth
Merge branch 'dev' of git@github.com:utwente-di/di20.git into dev

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

Conflicts:
	src/main/java/di20/rooster/Database.java
	src/main/java/di20/rooster/DatabaseTest.java
	src/main/java/di20/rooster/Employee.java
	src/main/java/di20/rooster/Staff.java
	src/main/webapp/index.jsp