no change
Merge branch 'develop' of github.com:hyrtyp/CNP_School into develop

Conflicts:
	CNP_School.iml
solve schoolinfo