update user info
Merge branch 'develop'