Added categories (article count pending)
Merge remote-tracking branch 'origin/master'