Merge branch 'master' into jgrpp-nrt

Merge NRT feature

# Conflicts:
#	docs/landscape.html
#	docs/landscape_grid.html
#	src/bridge_map.h
#	src/build_vehicle_gui.cpp
#	src/company_base.h
#	src/company_cmd.cpp
#	src/misc_gui.cpp
#	src/newgrf.cpp
#	src/newgrf_engine.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/npf/npf.cpp
#	src/road_cmd.cpp
#	src/road_func.h
#	src/road_gui.cpp
#	src/road_map.h
#	src/road_type.h
#	src/roadveh_cmd.cpp
#	src/saveload/afterload.cpp
#	src/saveload/company_sl.cpp
#	src/script/api/script_bridge.cpp
#	src/table/newgrf_debug_data.h
#	src/tile_cmd.h
#	src/town_cmd.cpp
#	src/tunnel_map.h
#	src/tunnelbridge_cmd.cpp

src/tile_cmd.h

@@ -66,7 +66,10 @@ struct TileDesc {
 	StringID railtype2;         ///< Type of second rail on the tile.
 	uint16 rail_speed;          ///< Speed limit of rail (bridges and track)
 	uint16 rail_speed2;         ///< Speed limit of second rail (bridges and track)
-	uint16 road_speed;          ///< Speed limit of road (bridges)
+	StringID roadtype;          ///< Type of road on the tile.
+	uint16 road_speed;          ///< Speed limit of road (bridges and track)
+	StringID tramtype;          ///< Type of tram on the tile.
+	uint16 tram_speed;          ///< Speed limit of tram (bridges and track)
 };
 
 /**