Fix config merge
Merge branch 'master' of github.com:xbadcode/Rubezh
Fix
Fix
Merge branch 'master' of github.com:xbadcode/Rubezh