Custom school selector instructions for GV
Fix table cell nesting in school selector
Merge branch 'master' into wip-gv-integration