add two major
add major
fix school_server
Merge branch 'minzu_dev_beta' into minzu