Merge branch 'editor' of https://github.com/yakubova/Tomato into editor
Merge branch 'editor' of https://github.com/yakubova/Tomato into editor
Modify editor toolbar