Merge branch 'master' into jgrpp-beta

# Conflicts:
#	src/economy.cpp
#	src/elrail.cpp
#	src/graph_gui.cpp
#	src/linkgraph/linkgraph_gui.cpp
#	src/network/core/game_info.cpp
#	src/newgrf_station.cpp
#	src/saveload/saveload.cpp
#	src/settings.cpp
#	src/station_cmd.cpp
#	src/station_gui.cpp
#	src/strings_func.h
#	src/table/settings/network_settings.ini
#	src/table/settings/settings.ini

src/strings.cpp

@@ -85,16 +85,6 @@ int64 StringParameters::GetInt64(WChar type)
 	return this->data[this->offset++];
 }
 
-/**
- * Shift all data in the data array by the given amount to make
- * room for some extra parameters.
- */
-void StringParameters::ShiftParameters(uint amount)
-{
-	assert(amount <= this->num_param);
-	MemMoveT(this->data + amount, this->data, this->num_param - amount);
-}
-
 /**
  * Set DParam n to some number that is suitable for string size computations.
  * @param n Index of the string parameter.
@@ -323,15 +313,6 @@ void SetDParamStr(uint n, const std::string &str)
 	SetDParamStr(n, str.c_str());
 }
 
-/**
- * Shift the string parameters in the global string parameter array by \a amount positions, making room at the beginning.
- * @param amount Number of positions to shift.
- */
-void InjectDParam(uint amount)
-{
-	_global_string_params.ShiftParameters(amount);
-}
-
 /**
  * Format a number into a string.
  * @param buff      the buffer to write to