Tidy MVC a little for editor
Merge branch 'master' of github.com:probmods/webchurch