Merge pull request #26 from synopia/master

Removed Admin and Organizer class
separated User from UserGroup