Editor
editor bug
Merge branch 'develop'