User the existed Categories service, instead of creating a redundant one
Merge remote-tracking branch 'origin/master'