Merge branch 'master' into jgrpp

# Conflicts:
#	src/airport_gui.cpp
#	src/build_vehicle_gui.cpp
#	src/direction_type.h
#	src/gfx_type.h
#	src/group_gui.cpp
#	src/misc_gui.cpp
#	src/rail_gui.cpp
#	src/road_gui.cpp
#	src/signs_gui.cpp
#	src/slope_func.h
#	src/smallmap_gui.cpp
#	src/terraform_gui.cpp
#	src/toolbar_gui.cpp
#	src/town_gui.cpp
#	src/town_type.h
#	src/vehicle_type.h
#	src/widget_type.h

src/string_type.h

@@ -15,10 +15,10 @@
 #include <string>
 
 /** A non-breaking space. */
-#define NBSP u8"\u00a0"
+#define NBSP "\u00a0"
 
 /** A left-to-right marker, marks the next character as left-to-right. */
-#define LRM u8"\u200e"
+#define LRM "\u200e"
 
 /**
  * Valid filter types for IsValidChar.