palette hax
fix tile height
Merge branch 'master' of https://github.com/SupSuper/OpenXcom into oXc_kL

Conflicts:
	src/Engine/Palette.cpp
	src/Savegame/Tile.cpp