Merge remote branch 'upstream/master' into 32bit_Surface_Support
ShaderDraw can now blit 32bit surfaces.
Merge remote branch 'Yankes_remote/ShaderDraw32bit' into 32bit_Surface_Support

Conflicts:
	src/Engine/Surface.cpp
Fix of couple of bugs
temp palette fix
Increase number of arguments of `ShaderDraw` up to 8.
Remove need for dummy args in `ColorFunc` of `ShaderDraw`
Fix for diffrent systems.
Merge remote branch 'Yankes_remote/ShaderDraw32bit' into 32bit_and_TFTD_support

Conflicts:
	src/Engine/Surface.cpp
	src/Engine/Surface.h
	src/Geoscape/Globe.cpp
	src/Resource/XcomResourcePack.cpp
More fixes