Merge branch 'feature_course_add_with_dept'