Updated various changes to support activities for a badge
Merge pull request #41 from jwendl/master

Updated various changes to support activities for a badge