Merge pull request #2 from Magenic/master

Need to grab latest changes
Committing before pulling new changes
Merge branch 'master' of https://github.com/jpeterson7755/Badge-Application
Initial checkin of badge approval page
Merge pull request #3 from Magenic/master

Grabbing changes to merge
Fixed xml comment error
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