schoolcolumn update
Merge branch 'schoolreg' into develop