update
update
msg
Merge branch 'xie' of https://github.com/xhy940801/scut into xie

Conflicts:
	App/Modules/Student/Action/InternshipApplyAction.class.php
Merge remote-tracking branch 'origin/xie' into xiao