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

Conflicts:
	Business/Business.csproj
	ProjectShow/Controllers/ProjectController.cs
	ProjectShow/ProjectShow.csproj