camera focus P1 !
merged
Map.SelectedCase
Map.SelectedCase lightfix
movable units
movePoints
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
move buttonfix
Merge branch 'master' of https://github.com/Aceltis/ProjetPoo
merge resolve
commit prepull
merged
build city
interface unit order button fixed
city suggestion preview