Merge pull request #12 from Magenic/master

Merge from master
Changes to project:
- Added a activity collection to the BadgeEdit
- Fixed problems with DTOs
- Added code to generate earned badges when an ActivitySubmission is Approved
- Added code to save earned badges.
- misc fixes
Merge pull request #43 from Bowman74/master

Changes to project: