Merge branch 'custom_bridgeheads' into jgrpp

# Conflicts:
#	docs/landscape.html
#	src/bridge_map.h
#	src/pbs.cpp
#	src/saveload/company_sl.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/settings_type.h
#	src/signal.cpp
#	src/train_cmd.cpp
#	src/tunnel_map.h
#	src/tunnelbridge_cmd.cpp
#	src/tunnelbridge_map.h
#	src/vehicle.cpp
#	src/viewport.cpp

src/table/settings.ini

@@ -1464,6 +1464,15 @@ str      = STR_CONFIG_SETTING_ENABLE_ROAD_CUSTOM_BRIDGE_HEADS
 strhelp  = STR_CONFIG_SETTING_ENABLE_ROAD_CUSTOM_BRIDGE_HEADS_HELPTEXT
 patxname = ""custom_bridge_heads.construction.road_custom_bridge_heads""
 
+[SDT_BOOL]
+base     = GameSettings
+var      = construction.rail_custom_bridge_heads
+def      = true
+cat      = SC_BASIC
+str      = STR_CONFIG_SETTING_ENABLE_RAIL_CUSTOM_BRIDGE_HEADS
+strhelp  = STR_CONFIG_SETTING_ENABLE_RAIL_CUSTOM_BRIDGE_HEADS_HELPTEXT
+patxname = ""custom_bridge_heads.construction.rail_custom_bridge_heads""
+
 [SDT_BOOL]
 base     = GameSettings
 var      = station.adjacent_stations