sanity check

sanity? check.
fix battlescape button thing
Merge branch 'master' of https://github.com/SupSuper/OpenXcom into oXc_kL

Conflicts:
	src/Battlescape/TileEngine.cpp
	src/Interface/BattlescapeButton.cpp
	src/Interface/BattlescapeButton.h