Merge branch 'master' into jgrpp

# Conflicts:
#	src/genworld_gui.cpp
#	src/group_gui.cpp
#	src/saveload/saveload.cpp
#	src/settings_gui.cpp
#	src/toolbar_gui.cpp
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h
#	src/widgets/dropdown.cpp
#	src/widgets/dropdown_type.h

src/stdafx.h

@@ -83,6 +83,7 @@
 #include <cstdlib>
 #include <climits>
 #include <cassert>
+#include <memory>
 
 #ifndef SIZE_MAX
 	#define SIZE_MAX ((size_t)-1)