Be consistent between the category list and individual categories

* use 'contents' rather than 'subCategories' for child items
* get rid of the CategoryNavigation entity and use Category instead