update
Merge branch 'master' of https://github.com/MaximOnline/bem-editor