Tests pista13
Merge remote-tracking branch 'origin/master'

Conflicts:
	UnitTestProject1/UnitTestProject.csproj