Merge remote-tracking branch 'origin/develop' into fx-map_events
InGameMenu - still in background
Merge remote-tracking branch 'origin/develop' into fx-map_events
Event place building
1st step for building placement
Merge remote-tracking branch 'origin/develop' into fx-map_events

Conflicts:
	Game/Game.cs
Building placement OK

Only tavern placement
Merge remote-tracking branch 'origin/Earthquake' into fx-map_events

Conflicts:
	Game/Buildings/BuildingsList.cs
	Game/Buildings/BuildingsModel.cs
All buildings placement OK
Merge branch 'fx-map_events' into develop

Conflicts:
	Gleipnir/GeneralPage.cs
	Gleipnir/InformationsUC.Designer.cs
	Gleipnir/InformationsUC.cs
	Gleipnir/InformationsUC.resx
Merge Map OK