Add Catetory to Filter
Change catetory in service element type to use catetory enum
Add Catetory to Filter
Change catetory in service element type to use catetory enum
Merge remote-tracking branch 'origin/development' into development