Multiple unit upgrades and merge with patch

Merges the code with the latest civ 5 patch.
Includes a few misc bugfixes in events.
Makes multiple unit upgrades possible (does not include UI for it)
Merge remote-tracking branch 'origin/master'

Conflicts:
	Erebusian ModComps/Erebusian ModComps.civ5suo