FIX: Compile error with the command line server
CHANGE: Reduced the time that it takes to unload a map
CHANGE: Modify simuconf.tab settings for better network performance
Merge branch '11.x' into 12.x
Merge branch '12.x' into devel-new

Conflicts:
	simhalt.cc
Merge branch 'devel-new' into 112.5-merge

Conflicts:
	simhalt.cc
	simutrans/config/simuconf.tab
FIX: Crash on quitting
Merge branch '112.5-merge' into way-improvements

Conflicts:
	Simutrans-Experimental.vcxproj.user
FIX: Crashes when loading games from previous versions of paksets in some cases.