try
Merge branch 'master' of github.com:liusongWtu/WtuThesisPlatform

Conflicts:
	WtuThesisPlatform/Web/js/admin/TeacherManager.js