VERSION: Increment to 11.22
CHANGE: Faster deletion of halts when unloading a map
FIX: Infinite loop in some cases.
Merge branch '11.x' into 12.x

Conflicts:
	simversion.h
Merge branch '12.x' into devel-new

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

Conflicts:
	simhalt.cc
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' of git://github.com/BerndGabriel/simutrans-experimental.git into 112.5-merge
CODE: Add comments relating to the disabling of the departure boards feature
FIX: Enable compiling without manually #defining SDL for MinGW
FIX: Better server timing (TurfIt)
FIX: Division by zero error, causing crashes in some instances.
FIX: Further division by zero errors, causing crashes in some instances.
Merge branch '11.x' into 12.x