CS fix
Merge pull request #393 from liuchuangww/user

User edit in process and fix activity
Fix avatar upload