fix homepage
Merge branch 'school_dev_beta' into school