Merge pull request #3 from SupSuper/master

sync
Merge pull request #4 from SupSuper/master

another explosion fix
compiler warning
Merge pull request #924 from GixG/zoom

Correction for B/R #795
teehee

who knew that was a WinNT define? anyone?
sanity check melee
layout
Merge branch 'master' of https://github.com/SupSuper/OpenXcom into oXc_kL

Conflicts:
	src/Battlescape/UnitWalkBState.cpp
	src/Savegame/BattleUnit.cpp