commiting asked
Merge branch 'master' of https://github.com/ecusson/ArtishowFixtures

Conflicts:
	Test/test-results/Test.csproj.test-cache