Instructor sorting fixed
Merge origin/master