Merge branch 'template_train_replacement' into jgrpp

# Conflicts:
#	src/saveload/extended_ver_sl.cpp

src/group_gui.cpp

@@ -952,7 +952,7 @@ public:
 				switch (index) {
 					case ADI_TEMPLATE_REPLACE: // TemplateReplace Window
 						if (vli.vtype == VEH_TRAIN) {
-							ShowTemplateReplaceWindow(this->unitnumber_digits, this->resize.step_height);
+							ShowTemplateReplaceWindow(this->unitnumber_digits);
 						}
 						break;
 					case ADI_REPLACE: // Replace window