Fixed makefile
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
fix mapdataset unloading
get a reference instead of making a new
actually, that stuff shouldn't be needed now either

since we're no longer deleting
Merge remote-tracking branch 'upstream/master'

Backport.