Minor fixes for main build

* Added edge-scrolling in the empire map, and allowed city-selection to persist
* Added instant fullscreen/windowed-mode changes, fix for windowed-mode being stuck
* Other minor fixes and adjustments