Merge pull request #45 from jbrewton/feature/contest_edit4

Feature/contest edit4
Merge remote-tracking branch 'upstream/development' into feature/contest_edit4