Revert "Separated the administrator from users"

Reverts netguru/people#13 - specs spec/features/teams_failing