journal refactoring
Merge branch 'master' of github.com:xbadcode/Rubezh into origin_master