Change scaling mode option
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Engine/Screen.cpp