Merge pull request #22 from Magenic/master

Merge from Master
Work to fix activities management grid issues.
Fixing issue #62
Moved bootstrapper file to more appropriate location.
Merge pull request #87 from Bowman74/master

Moved bootstrapper file to more appropriate location.
Merge pull request #24 from Magenic/master

Grabbing changes from mainline.
#81 Added initial code to authenticate against AD.  This means that the web app now needs AD to work correctly.  Additionally integration tests that require AD authentication are likely now failing.  Also fixed breaking change to business logic.
Merge pull request #89 from Bowman74/master

#81 Added initial code to authenticate against AD.  This means that the ...
Merge pull request #25 from Magenic/master

Merging into my fork.
Created a way to authenticate for our development efforts

We will delete this class once we are ready to deploy.
Fixing the rest of #58

Basically, verified that it was still working after the rollback which
it is.
Work to finish fixing add badge

Issues exist because of regression in CreateBadge.
Added DB Project for WebApi Authentication
Merge pull request #90 from jpeterson7755/master

Added DB Project for WebApi Authentication
Added WebApi project using an OAuth2 authentication scheme
Merge pull request #23 from Magenic/master

Merge from main
#81.  Finished AD integration.  Added mock assembly to use for testing when AD is not available.
Merge pull request #92 from Bowman74/master

#81, Completed AD integration and added mock authorization assembly.
Revert "Created a way to authenticate for our development efforts"

This reverts commit eccb8bcb04247dd100ad322f3f13100d199712b9.
Merge pull request #26 from Magenic/master

Merging changes into my fork.