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
Merge pull request #42 from Bowman74/master

Merge pull request #11 from Magenic/master
Merge pull request #12 from Magenic/master

Merge from master