Editor updates
Editor updates cleanup
updates to editor
Merge branch 'master' of github.com:calliopeinitiative/marca