更新
Merge branch 'master' of https://github.com/MrSaxon/tzy

Conflicts:
	protected/modules/master/views/school/update.php