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
fix #1359
Поправил фильрацию в модулях по категориям
updated to yiibooster 2.1.1
some fix for font awesome 4.0.3
Merge branch 'dev' of https://github.com/yupe/yupe into dev
Merge branch 'master' of https://github.com/yupe/yupe
Merge pull request #1379 from chemezov/category-back

Вернул категории к Adjacency list
improved user profile page + theme  fix
yiibooster 2.1.* again
composer.json fix
thanks @DexterHD +)
docs fix
Merge branch 'dev'