Merge branch 'master' into settings
complete
Merge branch 'deactivate_account' into settings
Merge branch 'settings'