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/string_type.h

@@ -13,6 +13,8 @@
 #define STRING_TYPE_H
 
 #include "core/enum_type.hpp"
+#include <vector>
+#include <string>
 
 /** A non-breaking space. */
 #define NBSP "\xC2\xA0"
@@ -54,4 +56,8 @@ enum StringValidationSettings {
 };
 DECLARE_ENUM_AS_BIT_SET(StringValidationSettings)
 
+
+/** Type for a list of strings. */
+typedef std::vector<std::string> StringList;
+
 #endif /* STRING_TYPE_H */