Update AccountUtils
Merge branch 'master' into account
(unfinish) Add logout button
Merge branch 'account'