Merge pull request #49 from Magenic/master

Merge from Main
Merge pull request #214 from jwendl/master

Changing approve activity screen to show the badge image as well.
#208, made changes to the manager report to properly return what badges may be awarded for an activity for approval.
Merge pull request #215 from Bowman74/master

#208 Changes to fix potential badges for manager approval objects.
Merge pull request #54 from Magenic/master

Merging changes into my mainline.