Merge pull request #25 from Magenic/master

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

Fixing issue #65
Merge pull request #100 from Bowman74/master

Merge pull request #25 from Magenic/master
Merge pull request #26 from Magenic/master

Merge From Main
#101, Activity Points Amount incorrectly locked down so only administrators can change.  The Award Value Amount should be locked down to only administrators but not the Activity Points Amount.
Merge pull request #102 from Bowman74/master

#101, Activity Points Amount incorrectly locked down so only administ…
Merge pull request #29 from Magenic/master

Updating my local fork.