[Branch ~dhis2-devs-core/dhis2/trunk] Rev 880: Merged CategoryOptionService, CategoryComboService and CategoryOptionComboService with CategorySe...

[DHIS_2_Users]