Merge pull request #53 from Magenic/master

Merge pull request #213 from jwendl/master
Changing activity approval screen to display badge images
Merge pull request #214 from jwendl/master

Changing approve activity screen to show the badge image as well.
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.
Reverting code changes to filter out test accounts.
Adding right search string on EmployeeListADPath

This is to avoid confusion about where to search AD.
Merge pull request #217 from jwendl/master

Reverting code changes involved with filtering out test accounts.
Initial work on the file loader for activities.
More changes to the app config for Activity Loader
Finalizing changes to support activity loading.
Merge pull request #218 from jwendl/master

Fixing issue #207
Fixing the activity console application because of issues related to loading of the application
Merge pull request #55 from Magenic/master

Merging to my local branch
Merge pull request #221 from jwendl/master

Fixing activity processor.
Setting up CSLA changes for functionality.
Finishing up CSLA work for new functionality.
Revert "Finishing up CSLA work for new functionality."

This reverts commit 245815f7dd0e40f6cca1514222746c9a0dfa7be8.
Revert "Revert "Finishing up CSLA work for new functionality.""

This reverts commit 1254f229ba0ce7c57470270dce3dcc80f6bfaa87.
More work on badge award admin screen.