Move users into database
Merge with master
Merge remote-tracking branch 'origin/master' into userdb
More work moving to userdb
Merge remote-tracking branch 'origin/master' into userdb
Move development port to 6542
Small bugfixes to userdb
Cleaner authentication
Fix authenticate
Merge remote-tracking branch 'origin/master' into userdb