4.22的全部内容 long
Merge branch 'master' of github.com:liusongWtu/WtuThesisPlatform

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

Conflicts:
	WtuThesisPlatform/WtuThesisPlatform.suo