Translaion maintenance.
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Further translation.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	bin/data/Language/Ukrainian.lng
Merge remote-tracking branch 'upstream/master'
Fixed missing resolution arrows.
fix some geo drag scroll stuff
trim some fat
New loading screen
force intro back to 320x200
fix scaling on game start

updateScale() relies on newDisplayWidth and newDisplayHeight being
consistent at all times, so we need to update it as soon as humanly possible
because we'll be switching around a lot to accomodate the intro
maximize info screens according to options

and default options according to OS.

grussel, please advise if this is correct syntax for detecting IOS
Cleanup
include MCD fixes from universal patch in ruleset.

it won't fix your floating sand tiles, and it won't stop units spawning in
weird positions, but it will fix weird TU costs and damage values on some things
change log
remove non-existant research items
Merge remote-tracking branch 'upstream/master' into experimental

Conflicts:
	src/Battlescape/BattlescapeState.cpp
	src/Battlescape/InventoryState.cpp
	src/Battlescape/UnitInfoState.cpp
	src/CMakeLists.txt
	src/Geoscape/Globe.cpp
	src/Menu/OptionsVideoState.cpp
	src/Menu/StartState.cpp

Ignore some changes for globe.cpp

Revert status screen changes (name is no longer a button)

Fix merge breakage
Revert "fix some geo drag scroll stuff"

This reverts commit faec3338ef3cfef77113b961ff1b043a5c6347f4.

Conflicts:
	src/Battlescape/BattlescapeState.cpp
	src/Geoscape/Globe.cpp

Sadly, this thing breaks globe on android. Will have to look into it later.
Revert globe.cpp (for real this time)

Also, some changes to BattlescapeState.cpp are in effect, apparently (git cleanup?)