screen positions
merged
Merge branch 'aceltis'

Conflicts:
	Civilization/CivilizationTests/bin/Debug/CivilizationLib.dll
	Civilization/CivilizationTests/bin/Debug/CivilizationLib.pdb
	Civilization/CivilizationTests/bin/Debug/CivilizationTests.dll
	Civilization/CivilizationTests/bin/Debug/CivilizationTests.pdb
resolving conflicts