Removed the word of sitename
Merge pull request #494 from adivspan/user-adivspan

Removed the sitename word
User list page and perm set in system module
Merge pull request #495 from sexnothing/user

User list page and perm set in system module
Changed search to inquiry
Add operate user return  user status
Merge pull request #496 from liuchuangww/user

Add operate user return  user status
Code cleaning up
Merge pull request #497 from liuchuangww/user

Code cleaning up
Clear form After new user and time clean up
Merge remote-tracking branch 'upstream/user' into user

Conflicts:
	usr/module/user/public/ng-template/admin/user-profile.html
	usr/module/user/template/admin/search.phtml
Merge pull request #498 from sexnothing/user

Clear form After new user and time clean up
Change user list order to id desc
Merge pull request #499 from liuchuangww/user

Change user list order to id desc
Fix delete user
Merge pull request #501 from liuchuangww/user

Fix delete user
User module admin bug edit
User module admin page bug edit
Merge pull request #502 from sexnothing/user

User
Fixed account setting