cleanup
REST start
settings
Merge branch 'master' into dev

Conflicts:
	src/main/java/di20/rooster/Database.java
untested add staff method