Revert "Rebase"

This reverts commit 36348af550286a52c21d3541412fed687a96558a.

Conflicts:
	Game/GodSpell/Heal.cs
	Game/SamhainFest.cs
	Gleipnir/TabIndex.cs
Merge branch 'fx-godSpells' into develop
Update Done

Save & GodSpells OK
Merge remote-tracking branch 'origin/fx-Upgrades' into develop

Conflicts:
	Game/Village.cs
	Game/Villager.cs
	Gleipnir/TabIndex.cs
	Gleipnir/TabIndex.cs.orig
Update Done

Add 1st Upgrade wave