categories/posts controllers, models, blocks
Merge remote-tracking branch 'master/master'