Refactoring user class to add separate service helpers to map user fields from api, set, and revoke admin.
Merge remote-tracking branch 'origin/master'