Merge remote-tracking branch 'jamespetts/master' into fix-city-limits
FIX walking between stations.  Remove non-functioning method of preventing infinite loops; add functioning method.  Before this fix, passengers would only walk between stations at the month change.
Rearrange and widen finance window to avoid having components on top of each other.  Aesthetics are much better.
Fix city limits expansion when city is building bridges.  Clean up associated code.
Merge branch 'fix-city-limits' of git://github.com/neroden/simutrans.git into devel-new

Conflicts:
	simhalt.cc