by  Jinqn
Merge branches 'gh-pages' and 'gh-pages' of https://github.com/campaign/m-editor into gh-pages