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

Conflicts:
	WtuThesisPlatform/Web/AdminUI/DictionaryManager.aspx