vnbv
Merge branch 'master' of https://github.com/ICL-LisaBlanchard/TamTests

Conflicts:
	TestProject7/App.config
	TestProject7/bin/Debug/AppliedSystems.Tam.Ui.Tests.dll
	TestProject7/bin/Debug/AppliedSystems.Tam.Ui.Tests.dll.config
	TestProject7/bin/Debug/AppliedSystems.Tam.Ui.Tests.pdb
	TestProject7/obj/Debug/AppliedSystems.Tam.Ui.Tests.dll
	TestProject7/obj/Debug/AppliedSystems.Tam.Ui.Tests.pdb
dsfsd
Merge branch 'master' of https://github.com/ICL-LisaBlanchard/TamTests

Conflicts:
	TestProject7/UnitTest1.cs
	TestProject7/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Merge branch 'master' of https://github.com/ICL-LisaBlanchard/TamTests

Conflicts:
	TestProject7/BaseUITest.cs
l;l
Merge branch 'master' of https://github.com/ICL-LisaBlanchard/TamTests
sd
Merge branch 'master' of https://github.com/ICL-LisaBlanchard/TamTests

Conflicts:
	TestProject7/UIMap.cs
Merge branch 'master' of https://github.com/ICL-LisaBlanchard/TamTests

Conflicts:
	TestProject7/UnitTest1.cs
tr
Merge branch 'master' of https://github.com/ICL-LisaBlanchard/TamTests

Conflicts:
	TestProject7/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
hg
jkj
Merge branch 'master' of https://github.com/ICL-LisaBlanchard/TamTests

Conflicts:
	TestProject7/BaseUITest.cs
	TestProject7/HouseActions.cs
	TestProject7/UIMap.cs
gjhjh
Merge branch 'master' of https://github.com/ICL-LisaBlanchard/TamTests
fhg
ghfgf
jhgh