merged master
fixing tests
Merge branch 'dev' into 73683928

Conflicts:
	src/main/resources/InstructorSampleData.json