update category functions
Merge branch 'master' into obstacle-service