UI for NW Discovery Happiness
Revert "UI for NW Discovery Happiness"

This reverts commit 287f7d4eb7140baeb17faf03e41305cf57fe3eb2.
Merge branch 'master' of https://github.com/Pazyryk/Ea_III_Sword_and_Sorcery
Merge branch 'master' of https://github.com/Pazyryk/Ea_III_Sword_and_Sorcery
Merge branch 'master' of https://github.com/Pazyryk/Ea_III_Sword_and_Sorcery
Merge branch 'master' of https://github.com/Pazyryk/Ea_III_Sword_and_Sorcery
Merge branch 'master' of https://github.com/Pazyryk/Ea_III_Sword_and_Sorcery
Merge branch 'master' of https://github.com/Pazyryk/Ea_III_Sword_and_Sorcery
Merge branch 'master' of https://github.com/Pazyryk/Ea_III_Sword_and_Sorcery
Merge branch 'master' of https://github.com/Pazyryk/Ea_III_Sword_and_Sorcery
Merge branch 'master' of https://github.com/Pazyryk/Ea_III_Sword_and_Sorcery
Merge branch 'master' of https://github.com/Pazyryk/Ea_III_Sword_and_Sorcery
Merge branch 'master' of https://github.com/Pazyryk/Ea_III_Sword_and_Sorcery
Merge branch 'master' of https://github.com/Pazyryk/Ea_III_Sword_and_Sorcery
Merge branch 'master' of https://github.com/Pazyryk/Ea_III_Sword_and_Sorcery
Merge branch 'master' of https://github.com/Pazyryk/Ea_III_Sword_and_Sorcery
Merge branch 'master' of https://github.com/Pazyryk/Ea_III_Sword_and_Sorcery
Hotfix b

-Fixes image popup not being closeable.
-Fixes bug with trade on newly founded cities.
Fixed missing local variable
Fix for natural harbor detection