Add Category to ServiceElement so GUI can show the category for a service element
Merge remote-tracking branch 'origin/development' into development