Fixed makefile
Stop the game from spamming the log
fix typo
fix comrades dying in your arms crashing the game
fix 648

set turning units back to a standing state if they spot an enemy in their
pre-movement turn
fix falling path preview
UI fixes
fix drag scrolling with black borders
Fix Linux build
Fix memory leaks
Fix compiler
Apply some snake oil to the compiler
Merge remote-tracking branch 'upstream/master' into experimental

Conflicts:
	src/Battlescape/BattlescapeState.cpp
	src/Engine/Game.cpp

Don't try to make an icon on Android (it's already handled by the Java wrapper)