fix user deletion
Merge branch 'new_architecture' of https://github.com/woda/server into new_architecture