game builder
Merge branch 'aceltis'

Conflicts:
	Civilization/Civilization.sdf
	Civilization/Civilization.suo
	Civilization/CivilizationAlgo/Release/CL.read.1.tlog
	Civilization/CivilizationAlgo/Release/CivilizationAlgo.log
	Civilization/CivilizationAlgo/Release/CivilizationAlgo.write.1.tlog
	Civilization/CivilizationAlgo/Release/mapalgo.obj
	Civilization/CivilizationAlgo/Release/vc100.pdb
	Civilization/CivilizationLib/GeneratedCode/Implementation/Desert.cs
	Civilization/CivilizationLib/GeneratedCode/Implementation/Mountain.cs
	Civilization/CivilizationLib/GeneratedCode/Implementation/Plain.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/CivilizationTests/obj/Release/CivilizationTests.dll
	Civilization/CivilizationTests/obj/Release/CivilizationTests.pdb
	Civilization/CivilizationWPF/GameWindow.xaml
	Civilization/CivilizationWPF/GameWindow.xaml.cs
	Civilization/CivilizationWPF/obj/x86/Release/App.g.cs
	Civilization/CivilizationWPF/obj/x86/Release/App.g.i.cs
	Civilization/CivilizationWPF/obj/x86/Release/CivilizationWPF.csproj.FileListAbsolute.txt
	Civilization/CivilizationWPF/obj/x86/Release/CivilizationWPF.csproj.GenerateResource.Cache
	Civilization/CivilizationWPF/obj/x86/Release/CivilizationWPF.g.resources
	Civilization/CivilizationWPF/obj/x86/Release/CivilizationWPF_Content.g.i.cs
	Civilization/CivilizationWPF/obj/x86/Release/CivilizationWPF_MarkupCompile.i.cache
	Civilization/CivilizationWPF/obj/x86/Release/MainWindow.g.i.cs
	Civilization/CivilizationWrapper/Debug/CivilizationWrapper.log
	Civilization/CivilizationWrapper/Release/.NETFramework,Version=v4.0.AssemblyAttributes.obj
	Civilization/CivilizationWrapper/Release/CL.read.1.tlog
	Civilization/CivilizationWrapper/Release/CL.write.1.tlog
	Civilization/CivilizationWrapper/Release/CivilizationWrapper.log
	Civilization/CivilizationWrapper/Release/Wrapper.obj
	Civilization/CivilizationWrapper/Release/cl.command.1.tlog
	Civilization/CivilizationWrapper/Release/vc100.pdb
	Civilization/Release/CivilizationAlgo.lib