Add counting of db rows per category.
Merge remote-tracking branch 'origin/master'