Revert "Separated the administrator from users"
Merge pull request #21 from netguru/revert-13-separate_admins

Revert "Separated the administrator from users"