UPD: #1225 for CategoryModule + small fix PSR
Merge branch 'master' of github.com:yupe/yupe
Merge branch 'master' of git://github.com/yupe/yupe