Merge remote-tracking branch 'origin/master' into SplitSnapshots

# Conflicts:
#	include/Engine/Network/Client.h
#	src/Engine/Network/Client.cpp

include/Engine/Network/Server.h

@@ -60,6 +60,7 @@ private:
     std::vector<Events::InputCommand> m_InputCommandsToBroadcast;
     //Timers
     std::clock_t m_StartPingTime;
+    std::string m_ServerName = "";
 
     // Packet loss logic
     PacketID m_PacketID = 0;