resolving fail
Merge branch 'aceltis' of https://github.com/Aceltis/ProjetPoo into aceltis
Merge branch 'master' into aceltis
bindings top
Merge branch 'aceltis'

Conflicts:
	Civilization/CivilizationLib/GeneratedCode/Implementation/Game.cs