UPD: fix rules sorting
Merge branch 'master' of github.com:yupe/yupe
Merge branch 'master' into nestedset-comments-v2