Making the editor work.
Merge branch 'master' into deploy

* master:
  Making the editor work.