fix 814

needz moar std::max
fix retaliation ending

relevant code was trapped in an irrelevant if()
merge + add BaseBits sprites

Merge branch 'master' of https://github.com/SupSuper/OpenXcom into oXc_kL
Conflicts:
	src/Basescape/CraftSoldiersState.cpp
	src/Battlescape/DebriefingState.cpp