Refactored category entity relationship.
Merge branch 'feature/mooc' into develop

* feature/mooc:
  Refactored category entity relationship.