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.
Fixing issue #210
Fixing issue #208

Just one part of it (the UI part), still may have issues with the query
after an activity is approved (the badge count list stays the same).
Merge pull request #213 from jwendl/master

Fixing issues related to #210 and #208
Merge pull request #49 from Magenic/master

Merge from Main