Added distinct incident categories
Improved category UI
Added incident count by category.
Merge branch 'incident-type-summary' into develop