Merge branch 'develop'
Update README.md
Remove editor-style.css
Merge branch 'master' into develop