Merge branch 'dev'
Merge branch 'master' of https://github.com/yupe/yupe
now we can disable url rules from userspace configs
small fix in image module
fix translations
Поправил баг с editorOptions в WebModule
fix conflict
Merge pull request #1377 from chemezov/fix-yupe-module

Поправил баг с editorOptions в WebModule
Merge branch 'dev' of https://github.com/yupe/yupe into dev
Merge branch 'master' of https://github.com/yupe/yupe