More support for user badges; references #27
Merge branch 'UserBadges' into mbda-develop
Merge pull request #110 from gsbodine/mbda-develop

Minor updates