haha, whoops
Merge branch 'master' of https://github.com/SupSuper/OpenXcom into oXc_kL

Conflicts:
	src/Battlescape/DelayedSaveState.cpp
Pathfinding: force walk for flyers using ALT.

	- fix out-of-order def'n of _movementType
BasescapeState: early out on RMB if facility not built.
Soldier Diary: surface adjust & colors
	- fix last CTD.
BattlescapeState: remove ALT (was for LMB -> RMB)
Globe: change colors of city-markers
Soldier: add wounds to SoldiersState list.