Merge branch 'update_scaling' of https://github.com/ivan-mogilko/ags-refactoring into 331_alpha1proposal

Conflicts:
	Engine/gfx/ali3dsw.cpp
	Engine/main/graphics_mode.cpp
	Engine/resource/version.rc
	Engine/setup/acwsetup.CPP