Adds methods to support counting categories of device information items
Implements displaying of categories for device information
Tidies up device information categories
Adds more accurate device name descriptions
Merge branch 'feature/category_support_for_device_info' into develop

* feature/category_support_for_device_info:
  Adds more accurate device name descriptions
  Tidies up device information categories
  Implements displaying of categories for device information
  Adds methods to support counting categories of device information items