Merge branch 'master' into jgrpp

# Conflicts:
#	src/bridge_map.h
#	src/crashlog.cpp
#	src/industry.h
#	src/linkgraph/linkgraph_type.h
#	src/order_type.h
#	src/saveload/afterload.cpp
#	src/settings.cpp
#	src/settings_type.h
#	src/smallmap_gui.cpp
#	src/spritecache.cpp
#	src/stdafx.h
#	src/table/settings.h.preamble
#	src/train.h
#	src/vehicle.cpp
#	src/viewport.cpp
#	src/viewport_func.h
#	src/widgets/station_widget.h
#	src/zoom_func.h
#	src/zoom_type.h

src/tbtr_template_vehicle.h

@@ -93,7 +93,7 @@ public:
 	bool replace_old_only;
 
 	// Things derived from a virtual train
-	OwnerByte owner;
+	Owner owner;
 
 	EngineID engine_type;               ///< The type of engine used for this vehicle.
 	CargoID cargo_type;                 ///< type of cargo this vehicle is carrying
@@ -101,7 +101,7 @@ public:
 	byte cargo_subtype;
 
 	byte subtype;
-	RailTypeByte railtype;
+	RailType railtype;
 
 	VehicleID index;