sleep soundly, reapers.
Merge branch 'master' of https://github.com/SupSuper/OpenXcom into oXc_kL

Conflicts:
	src/Savegame/BattleUnit.cpp