merge failures fixed
Merge branch 'dev' into 73683928

Conflicts:
	src/main/resources/InstructorSampleData.json
	src/test/resources/pages/InstructorHomeHTMLEmpty.html
	src/test/resources/pages/InstructorHomeNewInstructorWithSampleCourse.html
	src/test/resources/pages/InstructorHomeNewInstructorWithoutSampleCourse.html
	src/test/resources/pages/instructorHomeCourseDeleteSuccessful.html