Removed unused and refactored StudyStudent
Merge remote-tracking branch 'origin/master' into SmallChanges