Merge remote-tracking branch 'TFTD/32bit_and_TFTD_support' into Test32

Conflicts:
	src/Engine/Surface.cpp
	src/Engine/Surface.h
	src/Geoscape/Globe.cpp
	src/Resource/XcomResourcePack.cpp
Simplyfy Map.cpp bliting
Merge remote branch 'Yankes_remote/TFTD' into 32bit_and_TFTD_support

Conflicts:
	src/Engine/Surface.h