Merge pull request #58 from Magenic/master

Merge pull request #241 from jwendl/master
Fixing a minor issue with badge activities

We were always adding a badgeactivity row instead of adding them only
when we need to add them. This change will make it so it ensures that
Badge to Activity is 1..1 relationship.
Merge pull request #242 from jwendl/master

Merging in changes that were deployed to PROD