FIX: Sometimes, journeys with journey times would be incorrectly recorded when a convoy was merely turning around, causing the recording of anomalous and sometimes zero journey times.
FIX: Absence of space before name of type of goods in the industry window
FIX: Crashes on deleting cities.
FIX: Access rights were not reset on a player's bankruptcy
FIX: Trains sometimes passed signals at danger by 1 tile.
Merge branch '11.x' into 12.x
Merge branch '12.x' into devel-new

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

Conflicts:
	gui/fahrplan_gui.cc
	gui/schedule_list.cc
CODE: Remove commented out merge conflicts
CODE: Slight cleanup of code relating to in-transit percentages.
CODE: Add comment for merging
VERSION: Increment to 11.18
FIX: Compile error
CHANGE: Removed debug message relating to initialising binary heaps, as these were created far too often such that log files would become filled with these and little else.
Trivial commit
Merge branch '11.x' into 12.x

Conflicts:
	simversion.h
Merge branch '12.x' into devel-new
Merge branch 'devel-new' into 112.5-merge
CHANGE: Treat different steepnesses of slope differently for the purpose of physics and routefinding.
Merge branch '112.5-merge' of https://github.com/jamespetts/simutrans-experimental.git into 112.5-merge
Fixed: tree related index issues