Upgrades continue
Merge remote-tracking branch 'origin/SAVE' into fx-Upgrades
upgrades on tab
Merge branch 'develop' into fx-Upgrades

Conflicts:
	Game/Village.cs
	Gleipnir/TabIndex.Designer.cs
	Gleipnir/TabIndex.cs
	Gleipnir/TabIndex.resx
Revert "Merge branch 'develop' into fx-Upgrades"

This reverts commit 4d9b6f8596b195fc20b752be5fd56d366756b068, reversing
changes made to 8a42c857a055eab6b3ab61b8a3a6996b0d3ef241.
tabindex edition
Upgrades correction on show, to merge in developp
vous avez perdu ! en mode bricole vite fait.
l'arret du timer en fin de partie.
la fest se lance déshormais sur le village et un seul à la fois.
Merge branch 'fx-Upgrades' into develop

Conflicts:
	Game/Event.cs
	Game/Game.cs
	Game/GodSpell/Earthquake.cs
	Game/IWindow.cs
	Game/Upgrades/Crafter/CrafterTools/Scaffolding.cs
	Game/Upgrades/Crafter/Materials/Whitewash.cs
	Gleipnir/EventFluxUC.cs
	Gleipnir/GameEventUC.Designer.cs
	Gleipnir/HomepageUC.cs
	Gleipnir/InformationBox.cs
	Gleipnir/InformationsUC.Designer.cs
	Gleipnir/InformationsUC.cs
	Gleipnir/InformationsUC.resx
	Gleipnir/Properties/Resources.Designer.cs
	Gleipnir/Properties/Resources.resx
	Gleipnir/Resources/InformationBox_destroyed_background.png
	Gleipnir/SquareControl.cs
	Gleipnir/TabIndex.Designer.cs
	Gleipnir/TabIndex.cs
	Gleipnir/VillagerBannerUC.Designer.cs
	Tests/IWindowImplementationForTests.cs
	Tests/TestEpidemic.cs
	Tests/TestNameGenerator.cs
	Tests/TestsFamily.cs
	Tests/TestsJobs.cs
	Tests/TestsUpgrades.cs
	Tests/TestsVillage.cs
ActivityStatus passé en bitflag.
Merge complete
back to game button disabled.
Merge remote-tracking branch 'origin/acitivityStatus' into develop
Merge remote-tracking branch 'origin/YouLose' into develop