update user name
Merge branch 'master' into fun_login