merge feature branch 'roles' into development

This branch has started to diverge from its intention of developing roles.  Going to favor a generic 'featureBranch' instead. :)