Merge branch 'hotfix/instructor_select'
Merge branch 'develop'
round two of trying to fix postgres uppercase