Merge branch 'mbda-develop' into UserBadges
Some user badges added; references #27.
Merge branch 'UserBadges' into mbda-develop