编辑忽略文件，删除orig     long
Merge branch 'master' of github.com:liusongWtu/WtuThesisPlatform

Conflicts:
	.gitignore
	WtuThesisPlatform/WtuThesisPlatform.suo
	WtuThesisPlatform/WtuThesisPlatform.suo.orig