Merge branch 'fx-godSpells' into develop
Update done
non fonctionel.
Merge branch 'develop' into time
non fonctionnel
Merge remote-tracking branch 'origin/develop' into time

Conflicts:
	Game/Buildings/BuildingsModel.cs
	Gleipnir/GeneralPage.cs
eum un peu bancal.
Parameters box show DONE
fonctionnel.
Merge branch 'time' into develop