map correctly Bounded into control
map size
Merge branch 'aceltis'

Conflicts:
	Civilization/Civilization.sdf
	Civilization/Civilization.suo
	Civilization/CivilizationLib/GeneratedCode/Implementation/Unit.cs
	Civilization/CivilizationTests/bin/Debug/CivilizationLib.dll
	Civilization/CivilizationTests/bin/Debug/CivilizationLib.pdb
	Civilization/CivilizationTests/bin/Debug/CivilizationTests.dll
	Civilization/CivilizationTests/bin/Debug/CivilizationTests.pdb
	Civilization/CivilizationWPF/GameWindow.xaml.cs
	Civilization/CivilizationWrapper/Debug/CivilizationWrapper.log
resolve conflicts