Merge pull request #14 from jerv13/master

REF-51 - Updates and bug fixes for admin ui and roles.
Merge remote-tracking branch 'upstream/master'
Unit tests! Minor tweeks and bug fixes