Merge branch 'cargo_type_order' into jgrpp

# Conflicts:
#	src/pathfinder/yapf/yapf_common.hpp
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/station_sl.cpp
#	src/track_func.h

src/vehicle_base.h

@@ -349,7 +349,7 @@ public:
 	/** We want to 'destruct' the right class. */
 	virtual ~Vehicle();
 
-	uint32 GetLastLoadingStationValidCargoMask() const;
+	CargoTypes GetLastLoadingStationValidCargoMask() const;
 
 	void BeginLoading();
 	void CancelReservation(StationID next, Station *st);