Respect min_factory_spacing, rather than using the number "6"
Merge branch 'ncn-devel' of git://github.com/neroden/simutrans.git into 11.x
FIX: Remove spurious addition of 1 to the level of city buildings when reloading in some cases.