4.30中午   liu
Merge branch 'master' of github.com:liusongWtu/WtuThesisPlatform

Conflicts:
	WtuThesisPlatform/Web/StudentUI/StuInfo.aspx
	WtuThesisPlatform/Web/js/student/StuModifyPwd.js