Default window size in SDL 2 should work better now.
Display bug fixes and version update
Merge branch 'master' into v171

Conflicts:
	src/CGame.cpp
	src/common/CSettings.cpp
	src/lib/base/video/CSDLVideo.cpp
	src/lib/base/video/CVideoDriver.cpp
	version.h