FIX: Goods/mail/passengers would sometimes be loaded on convoys going in the wrong direction.
FIX: Reduce the instances of perverse routing when choose signals are used at complicated rail junctions
Fixed: new world gui
FIX: Vehicles on waterways did not record way statistics (backported from Standard)
FIX: Possible incorrect routing of road vehicles in some cases
CODE: Fix minor typing error in variable name
Merge branch '11.x' into 12.x
Merge branch '12.x' into devel-new
Merge branch 'devel-new' into 112.5-merge

Conflicts:
	simhalt.cc
	vehicle/simvehikel.cc
Merge branch '112.5-merge' of git://github.com/BerndGabriel/simutrans-experimental.git into 112.5-merge