VERSION: Increment to 11.22
CHANGE: Faster deletion of halts when unloading a map
Fixed: exception in VC++ if COLOUR_DEPTH == 0 and MULTI_THREAD
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
Merge branch '112.5-merge' into way-improvements
FIX: Compile error with the command line server