Fixed a bug in trade route yields caused by odd Firaxis code.
Removed hashes from notificationtypes enum which conflicted with custom notifications implementation.
Merge branch 'CustomNotifications' into CustomSystems
Merge branch 'CustomSystems' into SiegeMod