move scale switch into Screen.cpp
switch scale for inventory/minimap/etc

make em full screen

i'm going to regret this in the morning, aren't i?
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/Menu/OptionsBaseState.cpp
Remove android-only code, as it's now in the upstream (and written better)
revert change in resetDisplay call (since I'm overriding it anyway)
Revert my resolution changes in favor of Warboy's
Turn soldier's name into a button, since pressing the "back" button doesn't always do what you expect it to on an Android device.