Merge pull request #12 from roaet/lost_admin_bug

Fixed admin role removal bug
Merge branch 'development' of https://github.com/roaet/wafflehaus into support_travis