student resident fixes
Merge branch 'master' into development

Pull Merge from master