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

README.md

@@ -438,7 +438,6 @@ OpenTTD has been ported to several platforms and operating systems. It should
 not be very difficult to port it to a new platform. The currently working
 platforms are:
 
-- DOS (Allegro)
 - FreeBSD (SDL)
 - Haiku (SDL)
 - Linux (SDL or Allegro)
@@ -841,17 +840,6 @@ Use '`make`', but do a '`./configure`' before the first build.
 A comprehensive GNU build environment is required to build the OS/2 version.
 See the docs/Readme_OS2.txt file for more information.
 
-### DOS:
-
-A build environment with DJGPP is needed as well as libraries such as
-Allegro, zlib and libpng, which all can be downloaded from the DJGPP
-website. Compilation is straight forward: use '`make`', but do a '`./configure`'
-before the first build. The build binary will need cwsdpmi.exe to be in
-the same directory as the openttd executable. cwsdpmi.exe can be found in
-the os/dos/cwsdpmi subdirectory. If you compile with stripping turned on a
-binary will be generated that does not need cwsdpmi.exe by adding the
-cswdstub.exe to the created OpenTTD binary.
-
 ### 7.1) Required/optional libraries
 
 The following libraries are used by OpenTTD for:
@@ -1038,16 +1026,6 @@ License 2.1, and partly under the (3-clause) BSD license. The exact licensing
 terms can be found in src/3rdparty/os2/getaddrinfo.c resp.
 src/3rdparty/os2/getnameinfo.c.
 
-The exe2coff implementation in os/dos/exe2coff is available under the
-GPL, with a number of additional terms. See os/dos/exe2coff/copying and
-os/dos/exe2coff/copying.dj for the exact licensing terms.
-
-The CWSDPMI implementation in os/dos/cwsdpmi is distributed under a
-custom binary-only license that prohibits modification. The exact
-licensing terms can be found in os/dos/cwsdpmi/cwsdpmi.txt. The sources
-for these files can be downloaded at its author site, at
-http://homer.rice.edu/~sandmann/cwsdpmi/csdpmi5s.zip.
-
 CONTRIBUTING.md is adapted from
 [Bootstrap](https://github.com/twbs/bootstrap/blob/master/CONTRIBUTING.md)
 under the [Creative Commons Attribution 3.0 Unported