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

source.list

@@ -292,6 +292,7 @@ newgrf_industrytiles.h
 newgrf_object.h
 newgrf_properties.h
 newgrf_railtype.h
+newgrf_roadtype.h
 newgrf_sound.h
 newgrf_spritegroup.h
 newgrf_station.h
@@ -326,6 +327,7 @@ rail.h
 rail_gui.h
 rail_type.h
 rev.h
+road.h
 road_cmd.h
 road_func.h
 road_gui.h
@@ -722,6 +724,7 @@ table/pricebase.h
 table/railtypes.h
 table/road_land.h
 table/roadveh_movement.h
+table/roadtypes.h
 ../objs/settings/table/settings.h
 table/sprites.h
 table/station_land.h
@@ -878,6 +881,7 @@ script/api/script_order.hpp
 script/api/script_rail.hpp
 script/api/script_railtypelist.hpp
 script/api/script_road.hpp
+script/api/script_roadtypelist.hpp
 script/api/script_sign.hpp
 script/api/script_signlist.hpp
 script/api/script_station.hpp
@@ -946,6 +950,7 @@ script/api/script_order.cpp
 script/api/script_rail.cpp
 script/api/script_railtypelist.cpp
 script/api/script_road.cpp
+script/api/script_roadtypelist.cpp
 script/api/script_sign.cpp
 script/api/script_signlist.cpp
 script/api/script_station.cpp
@@ -1034,6 +1039,7 @@ newgrf_industries.cpp
 newgrf_industrytiles.cpp
 newgrf_object.cpp
 newgrf_railtype.cpp
+newgrf_roadtype.cpp
 newgrf_sound.cpp
 newgrf_spritegroup.cpp
 newgrf_station.cpp