try to read the player's mind when using melee with large units
merge + add Const

Merge branch 'master' of https://github.com/SupSuper/OpenXcom into oXc_kL
Conflicts:
	src/Battlescape/ActionMenuState.cpp
	src/Battlescape/TileEngine.cpp
	src/Battlescape/TileEngine.h