Fix admin roles and resources.
Try to add server paging
Merge origin/dev-master into dev-master