Merge pull request #32 from Magenic/master

Merging into my local branch
Merge pull request #33 from Magenic/master

Merging changes into my main fork.
Merge pull request #117 from jpeterson7755/master

Initial check in of the badge approval screen
Merge pull request #30 from Magenic/master

Merge from master
#118 , Made auditing changes to record who added an activity and badge.
Merge pull request #119 from Bowman74/master

#118, Added create auditing fields for badge and activity edit.
Merge pull request #34 from Magenic/master

Merging into local fork
Work on getting Issue #120 to at least show model state errors
Merge pull request #121 from jwendl/master

Merging in changes to help with issue #120
Merge pull request #4 from Magenic/master

Need to grab latest