Changed Editor to Discussion Editor
Merge branch 'master' of https://github.com/mysteryhunt/puzzle-editing