Remove hardcoded category id in @agrowe's code
More checks on course category
Update ChangeLog
Clean up get_all_editing_roles()
Merge remote-tracking branch 'upstream/master'