decorator qui rox
region, bindings
debug
Merge branch 'aceltis'

Conflicts:
	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
	Civilization/CivilizationWPF/GameWindow.xaml.cs