Added school changes to schema
Merge branch 'master' into production