Merge branch '11.x' into devel-new

Conflicts:
	simversion.h
Merge branch 'fix-city-limits' of git://github.com/neroden/simutrans.git into devel-new

Conflicts:
	simhalt.cc
Merge branch '11.x' into devel-new
Merge branch '11.x' into devel-new
FIX: Buses and trams could set a different player's stop in their schedule when it was on a public road, but it would wrongly register as a waypoint.
FIX: Deal with waypoint issues by assuming that all waypoints are reversing unless shown to be otherwise in actual use. Will mean that trains will slow down for non-reversing waypoints the first time that they encounter them in their schedule, but not thereafter. TODO: Find a better fix for this complex problem.
FIX: Reserved blocks were not unreserved if a convoy was forced by a change in way layout to change its route mid-journey
CODE: Remove obsolete commented out code
FIX: For some reason, industries would sometimes be built with inappropriate supplier or consumer connexions. Added an extra check to prevent this.
CODE: Minor reorganisation of some code for electricity supply.
CHANGE: Save "last_power_demand" from version 12.0 onwards. This should reduce desyncs when the version number is stepped (but not until then).
FIX: Allow previous possible fix to some desyncs to work in the current (11.x) version
FIX: Convoys would not adopt their proper waiting time slot when another convoy on the same line is just reversing ready to depart the relevant station.
FIX: Incorrect means of saving "last_power_demand": fix to earlier fix.
VERSION: Step to release version
Merge branch '11.x' into devel-new

Conflicts:
	simversion.h
Merge branch 'devel-new' into passenger-generation

Conflicts:
	simhalt.cc