Merge pull request #205 from jwendl/master

Fixing security issues and merging in changes.
Merge pull request #48 from Magenic/master

Merge from main
#208 changed ApproveActivitiyCollection so each item contains a collection of badges that will be awarded if a specific activity is approved.
Merge pull request #211 from Bowman74/master

 #208 changed ApproveActivitiyCollection so each item contains a collection of badges that may be awarded.
Merge pull request #52 from Magenic/master

Grabbing database changes for multiple badges.