Merge remote-tracking branch 'origin/master' into 537

Conflicts:
	Business/Contrast_WorkflowMainModel.cs
	Contrast/Contrast.csproj
	Contrast/Controllers/Contrast_WorkflowMainController.cs
	EF/EF.csproj
	EF/Migrations/201410290816408_Update.Designer.cs
	EF/Migrations/201410300235428_adds.Designer.cs
	EF/Migrations/201410300235428_adds.resx
	EF/Migrations/201410300646445_Update.Designer.cs
	EF/Migrations/201410300646445_Update.resx
Merge remote-tracking branch 'ProjectShow/wsq_1'

Conflicts:
	EF/Context.cs
	EF/EF.csproj
	EF/Migrations/201407300429599_Update.Designer.cs
	EF/Migrations/201407300429599_Update.resx
	ProjectShow/Web.config