replace old editor data with new editor data
Merge branch 'master' into gh-pages
rebuild