Merge pull request #33 from Magenic/master

Merge from Main
Merge pull request #34 from Magenic/master

Merge from main
#120, fixed problem with BadgeEditViewModel causing badges not to be able to be saved.  It was being used as a parameter on an action which was causing the model binder to create a new instance of an object through the default constructor instead of the factory.  This meant that the createuserId was never set and an error was being added to the model state later causing a problem with the model binder.  The ironic part of this error is that the version of the class being created through the default constructor and not through the factory method was never used and immediately discarded after it had done its damage to the post back.
Merge pull request #130 from Bowman74/master

#120, fixed problem with BadgeEditViewModel causing badges not to be able to be saved.
Merge pull request #37 from Magenic/master

Merging into my main fork