Add edit user for admin
Merge pull request #300 from liuchuangww/user

Add edit user for admin
Merge branch 'user' into permission
Permission debugging
Permission fixes