log update
Merge branch 'master' of https://github.com/satorare/Project_Onion_Server
account-manager update
log update
account-manager resolved