Merge branch 'enhanced_viewport_overlay-sx' into jgrpp

town_gui.cpp updated due to struct CommandContainer change.

Conflicts:
	src/command.cpp
	src/command_type.h
	src/gfxinit.cpp
	src/openttd.cpp
	src/pbs.cpp
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/saveload/saveload.cpp
	src/stdafx.h
	src/train_cmd.cpp
	src/viewport_type.h
	src/window_type.h

src/window_type.h

@@ -710,6 +710,11 @@ enum WindowClass {
 	 */
 	WC_DEPARTURES_BOARD,
 
+	/**
+	 * Plans window.
+	 */
+	WC_PLANS,
+
 	WC_INVALID = 0xFFFF, ///< Invalid window.
 };