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
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