Merge branch 'master' into develop

* master:
  Add ReadMe.md
Editor code Refactoring
Merge branch 'develop'

* develop:
  Editor code Refactoring