Refactored so toc and category titles only show up if more than one category is present.
Version bumped from 7.x-1.6-rc4 to 7.x-1.6-rc5
Merge branch 'release-7.x-1.6-rc5'