Merge branch 'master' into jgrpp

Replace build and refit, and group collapse implementations
Fix template creation build and refit

# Conflicts:
#	Makefile.bundle.in
#	config.lib
#	src/animated_tile.cpp
#	src/blitter/32bpp_anim.hpp
#	src/blitter/32bpp_base.hpp
#	src/blitter/8bpp_base.hpp
#	src/blitter/null.hpp
#	src/build_vehicle_gui.cpp
#	src/command.cpp
#	src/command_func.h
#	src/console_gui.cpp
#	src/core/smallstack_type.hpp
#	src/date.cpp
#	src/debug.cpp
#	src/genworld_gui.cpp
#	src/ground_vehicle.hpp
#	src/group_gui.cpp
#	src/lang/korean.txt
#	src/linkgraph/linkgraph_gui.h
#	src/main_gui.cpp
#	src/misc_gui.cpp
#	src/network/core/game.h
#	src/network/core/packet.cpp
#	src/network/core/udp.cpp
#	src/network/core/udp.h
#	src/network/network_content.cpp
#	src/network/network_type.h
#	src/network/network_udp.cpp
#	src/newgrf_house.h
#	src/openttd.cpp
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/os/unix/crashlog_unix.cpp
#	src/os/windows/crashlog_win.cpp
#	src/osk_gui.cpp
#	src/pathfinder/opf/opf_ship.cpp
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/saveload/saveload.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/smallmap_gui.h
#	src/station_base.h
#	src/station_cmd.cpp
#	src/table/gameopt_settings.ini
#	src/table/newgrf_debug_data.h
#	src/table/settings.ini
#	src/timetable_gui.cpp
#	src/toolbar_gui.cpp
#	src/train_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/vehiclelist.cpp
#	src/viewport.cpp
#	src/widgets/dropdown.cpp
#	src/window_gui.h

src/signal.cpp

@@ -26,7 +26,7 @@
 #include "safeguards.h"
 
 /// List of signals dependent upon this one
-typedef SmallVector<SignalReference, 4>     SignalDependencyList;
+typedef std::vector<SignalReference>     SignalDependencyList;
 
 /// Map of dependencies. The key identifies the signal,
 /// the value is a list of all of the signals which depend upon that signal.
@@ -825,21 +825,21 @@ void AddSignalDependency(SignalReference on, SignalReference dep)
 {
 	assert(GetTileOwner(on.tile) == GetTileOwner(dep.tile));
 	SignalDependencyList &dependencies = _signal_dependencies[on];
-	(*dependencies.Append()) = dep;
+	dependencies.push_back(dep);
 }
 
 void RemoveSignalDependency(SignalReference on, SignalReference dep)
 {
 	SignalDependencyList &dependencies = _signal_dependencies[on];
-	SignalReference *ob = dependencies.Find(dep);
+	auto ob = std::find(dependencies.begin(), dependencies.end(), dep);
 
 	// Destroying both signals in same command
-	if(ob == dependencies.End())
-		return;
+	if (ob == dependencies.end()) return;
 
-	dependencies.Erase(ob);
-	if (dependencies.Length() == 0)
+	dependencies.erase(ob);
+	if (dependencies.size() == 0) {
 		_signal_dependencies.erase(on);
+	}
 }
 
 void FreeSignalDependencies()
@@ -853,13 +853,12 @@ static void MarkDependencidesForUpdate(SignalReference on)
 	if (f == _signal_dependencies.end()) return;
 
 	SignalDependencyList &dependencies = f->second;
-	for (SignalReference *i = dependencies.Begin(), *e = dependencies.End();
-			i != e; ++i) {
-		assert(GetTileOwner(i->tile) == GetTileOwner(on.tile));
+	for (const SignalReference &i : dependencies) {
+		assert(GetTileOwner(i.tile) == GetTileOwner(on.tile));
 
-		Trackdir td = TrackToTrackdir(i->track);
-		_globset.Add(i->tile, TrackdirToExitdir(td));
-		_globset.Add(i->tile, TrackdirToExitdir(ReverseTrackdir(td)));
+		Trackdir td = TrackToTrackdir(i.track);
+		_globset.Add(i.tile, TrackdirToExitdir(td));
+		_globset.Add(i.tile, TrackdirToExitdir(ReverseTrackdir(td)));
 	}
 }
 
@@ -900,9 +899,9 @@ void CheckRemoveSignal(TileIndex tile, Track track)
 	if (i != e) {
 		SignalDependencyList &dependencies = i->second;
 
-		for (SignalReference *ir = dependencies.Begin(), *er = dependencies.End(); ir != er; ++ir) {
-			assert(GetTileOwner(ir->tile) == GetTileOwner(tile));
-			NotifyRemovingDependentSignal(thisRef, *ir);
+		for (const SignalReference &ir : dependencies) {
+			assert(GetTileOwner(ir.tile) == GetTileOwner(tile));
+			NotifyRemovingDependentSignal(thisRef, ir);
 		}
 
 		_signal_dependencies.erase(i);