Merge branch 'master' into get-users

Conflicts:
server/api/api.go
server/routes/routes.go
server/test/account_test.go