Merge branch 'template_train_replacement-sx' into jgrpp

# Conflicts:
#	src/build_vehicle_gui.cpp
#	src/saveload/afterload.cpp

src/saveload/saveload_internal.h

@@ -49,6 +49,8 @@ void ConnectMultiheadedTrains();
 Engine *GetTempDataEngine(EngineID index);
 void CopyTempEngineData();
 
+void AfterLoadTemplateVehiclesUpdateImage();
+
 extern int32 _saved_scrollpos_x;
 extern int32 _saved_scrollpos_y;
 extern ZoomLevelByte _saved_scrollpos_zoom;