Adding courses' categories.
Merge remote-tracking branch 'origin/develop' into develop