Merge Query and QueryString option properities

https://github.com/Quobject/SocketIoClientDotNet/issues/16

Author: mattqs

Src/EngineIoClientDotNet.Tests.mono/ClientTests/ServerConnectionTest.cs

@@ -26,7 +26,15 @@ public void OpenAndClose()
 
             var events = new ConcurrentQueue<string>();
 
-            var socket = new Socket(CreateOptions());
+            var options = CreateOptions();
+            options.Query = new Dictionary<string, string>
+            {
+                {
+                    "access_token", "akaka"
+                }
+            };
+            options.QueryString = "akka=ekek";
+            var socket = new Socket(options);
             socket.On(Socket.EVENT_OPEN, () =>
             {
                 log.Info("EVENT_OPEN");

Src/EngineIoClientDotNet.mono/Client/Socket.cs

@@ -141,6 +141,16 @@ public Socket(Options options)
             Hostname = options.Hostname;
             Port = options.Port;
             Query = options.QueryString != null ? ParseQS.Decode(options.QueryString) : new Dictionary<string, string>();
+
+            if (options.Query != null)
+            {
+                foreach (var item in options.Query)
+                {
+                    Query.Add(item.Key,item.Value);
+                }
+            }
+
+
             Upgrade = options.Upgrade;
             Path = (options.Path ?? "/engine.io").Replace("/$", "") + "/";
             TimestampParam = (options.TimestampParam ?? "t");