Code cleaning up
User page in system module
Merge pull request #339 from liuchuangww/user

Code cleaning up
Merge pull request #340 from sexnothing/user

User page in system module
Fix search
Merge pull request #341 from liuchuangww/user

Fix search
Code cleaning up
Merge pull request #342 from liuchuangww/user

Code cleaning up
Added user role action
$this is only available as of PHP 5.4
$this is only available as of PHP 5.4
Updated operation level
Updated operation level
Reduced auto-installed roles
Changed array format
User and role page in system
Merge remote-tracking branch 'upstream/user' into user
Comment branch conflicts
Conflicts:
	usr/module/system/src/Controller/Admin/PermController.php
Merge pull request #344 from sexnothing/user

User
Added parameters to User::Data
Restore overwritten file