add school
update database
Merge branch 'feature/add-school' into develop