cbvc
uimap
Merge branch 'master' of https://github.com/ICL-LisaBlanchard/TamTests.git

Conflicts:
	TestProject7/UIMap.cs
	TestProject7/obj/Debug/TamTests.csproj.FileListAbsolute.txt