FIX: Compile errors in Windows
FIX: Redefinition bug
FIX: Too many %s in the goods window
VERSION: Step version type for (hopefully) final RC before full release
FIX: Crash on unloading map
FIX: Various errors when "DEBUG" was not defined.
VERSION: Reset to development build and increment number
FIX: Spurious way constraints on bridges and tunnels
FIX: Incorrect encoding of way constraints on bridges
FIX: Crash (division by zero) at the end of each month when the interest rate was 0.
FIX: Allow ways with weight limits > 9999t
FIX: The server crashes when a client cretes a new line
FIX: Incorrect determination of whether a player can afford to build a substation
Merge branch 'jp-11x' into merge-from-james

Conflicts:
	simconvoi.cc
Merge branch 'ncn-devel' into prettier-cities-2