Preparing editor
Merge branch 'master' of https://github.com/sergey-zakharov/EdPlatform