d
Merge branch 'master' into RemoteRuns/Tape

Conflicts:
	MvcMainApplication/MvcMainApplication.Tests/TestControllerTest.cs
3
Merge branch 'RemoteRuns/Tape'