Merge branch 'template_train_replacement-sx' into jgrpp

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

src/saveload/afterload.cpp

@@ -3216,6 +3216,7 @@ bool AfterLoadGame()
 	AfterLoadLinkGraphs();
 
 	AfterLoadTraceRestrict();
+	AfterLoadTemplateVehiclesUpdateImage();
 
 	/* Show this message last to avoid covering up an error message if we bail out part way */
 	switch (gcf_res) {
@@ -3261,4 +3262,5 @@ void ReloadNewGRFData()
 	/* redraw the whole screen */
 	MarkWholeScreenDirty();
 	CheckTrainsLengths();
+	AfterLoadTemplateVehiclesUpdateImage();
 }