indian commit
Merge branch 'master' of github.com:qtau-devgroup/editor