lol
slight alteration to triscene draw method
layout
Merge branch 'master' of https://github.com/SupSuper/OpenXcom into oXc_kL

Conflicts:
	src/Battlescape/UnitSprite.cpp