Some changes

git-tfs-id: [http://spb8590:8080/tfs/defaultcollection]$/TestProject/src/TestSolution;C109
Merge remote-tracking branch 'refs/remotes/tfs/default' into GitRelease10

Conflicts:
	TestSolution/Class3.cs
aaa