Merge branch 'courseInstructor'