Complete merge

Sources/Client/Client.cpp

@@ -65,6 +65,7 @@
 #include "ClientPlayer.h"
 #include "ClientUI.h"
 #include "Fonts.h"
+#include <Core/Strings.h>
 
 static float nextRandom() {
 	return (float)rand() / (float)RAND_MAX;

Sources/Gui/Main.cpp

@@ -37,6 +37,7 @@
 #include <Client/Client.h>
 #include <Core/CpuID.h>
 #include <Gui/StartupScreen.h>
+#include <Core/Strings.h>
 
 #include <Core/VoxelModel.h>
 #include <Draw/GLOptimizedVoxelModel.h>

Sources/Gui/MainScreen.cpp

@@ -27,6 +27,7 @@
 #include <Client/Client.h>
 #include <Core/Settings.h>
 #include <Client/Fonts.h>
+#include <Core/Strings.h>
 
 SPADES_SETTING(cg_lastQuickConnectHost, "127.0.0.1");
 SPADES_SETTING(cg_protocolVersion, "");