Update with the latest editor code
Merge branch 'develop' of github.com:basekit-templates/tdk into develop