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/os/unix/crashlog_unix.cpp

@@ -140,7 +140,7 @@ class CrashLogUnix : public CrashLog {
 	void *signal_instruction_ptr;
 #endif
 
-	/* virtual */ char *LogOSVersion(char *buffer, const char *last) const
+	char *LogOSVersion(char *buffer, const char *last) const override
 	{
 		struct utsname name;
 		if (uname(&name) < 0) {
@@ -160,7 +160,7 @@ class CrashLogUnix : public CrashLog {
 		);
 	}
 
-	/* virtual */ char *LogOSVersionDetail(char *buffer, const char *last) const
+	char *LogOSVersionDetail(char *buffer, const char *last) const override
 	{
 		struct utsname name;
 		if (uname(&name) < 0) return buffer;
@@ -177,7 +177,7 @@ class CrashLogUnix : public CrashLog {
 		return buffer;
 	}
 
-	/* virtual */ char *LogError(char *buffer, const char *last, const char *message) const
+	char *LogError(char *buffer, const char *last, const char *message) const override
 	{
 		buffer += seprintf(buffer, last,
 				"Crash reason:\n"
@@ -247,7 +247,7 @@ class CrashLogUnix : public CrashLog {
 	 *
 	 * Also log GDB information if available
 	 */
-	/* virtual */ char *LogRegisters(char *buffer, const char *last) const
+	char *LogRegisters(char *buffer, const char *last) const
 	{
 		buffer = LogGdbInfo(buffer, last);
 
@@ -387,7 +387,7 @@ class CrashLogUnix : public CrashLog {
 	 * Note that GCC complains about 'buffer' being clobbered by the longjmp.
 	 * This is not an issue as we save/restore it explicitly, so silence the warning.
 	 */
-	/* virtual */ char *LogStacktrace(char *buffer, const char *last) const
+	char *LogStacktrace(char *buffer, const char *last) const override
 	{
 		buffer += seprintf(buffer, last, "Stacktrace:\n");