Merge branch 'editor'
Merge branch 'master' of github.com:figa12/CCS-tool
Merge branch 'editor'