Nope
do the thing
fix geoscape borders
break translations
Merge remote-tracking branch 'upstream/master' into experimental

(what, a conflict-less merge?)
Fix (probably) touch handling for devices that don't have a 16:10 screen
Comment out Warboy's commit since it breaks our geoscape