editor updates
Merge branch 'staging' of https://github.com/Zeega/Zeega into stable