More support for user badges; references #27
Merge branch 'UserBadges' into mbda-develop