this course / other courses wording
name_short for category table added
Merge remote-tracking branch 'origin/experimental'