Merge pull request #1166 from angel-kulikov/master

Готовимся к Namespaces
мелкие правки
Merge branch 'master' of https://github.com/yupe/yupe
revert
revert
Merge branch 'master' of https://github.com/yupe/yupe
revert
revert
revert back
new architecture