Merge lp:~dangarner/xibo/client-170-beta into lp:xibo/1.7

[Dan Garner]

=== modified file 'client/dotNET/Control/Region.cs'
--- client/dotNET/Control/Region.cs	2014-09-01 13:33:50 +0000
+++ client/dotNET/Control/Region.cs	2014-11-26 10:33:06 +0000
@@ -147,7 +147,7 @@
                 // If the sequence hasnt been changed, OR the layout has been expired
                 // there has been no change to the sequence, therefore the media we have already created is still valid
                 // or this media has actually been destroyed and we are working out way out the call stack
-                if (_currentSequence == temp || _layoutExpired)
+                if (_layoutExpired || (_currentSequence == temp))
                     return;
 
                 // Store the Current Index
@@ -377,7 +377,10 @@
                     }
                     catch
                     {
-                        System.Diagnostics.Trace.WriteLine("Non integer updateInterval in XLF", "Region - SetNextMediaNode");
+                        // Update interval not defined, so assume a high value
+                        _options.updateInterval = 3600;
+
+                        Trace.WriteLine("Non integer updateInterval in XLF", "Region - SetNextMediaNode");
                     }
                 }
 
@@ -489,8 +492,9 @@
                 }
             }
 
-            // Sets up the timer for this media
-            media.Duration = options.duration;
+            // Sets up the timer for this media, if it hasn't already been set
+            if (media.Duration == 0)
+                media.Duration = options.duration;
 
             // Add event handler for when this completes
             media.DurationElapsedEvent += new Media.DurationElapsedDelegate(media_DurationElapsedEvent);
 
=== modified file 'client/dotNET/Forms/OptionForm.Designer.cs'
--- client/dotNET/Forms/OptionForm.Designer.cs	2014-08-29 19:31:56 +0000
+++ client/dotNET/Forms/OptionForm.Designer.cs	2014-11-26 10:33:06 +0000
@@ -40,7 +40,6 @@
             this.textBoxServerKey = new System.Windows.Forms.TextBox();
             this.textBoxLibraryPath = new System.Windows.Forms.TextBox();
             this.buttonDisplayAdmin = new System.Windows.Forms.Button();
-            this.groupBox2 = new System.Windows.Forms.GroupBox();
             this.textBoxProxyDomain = new System.Windows.Forms.TextBox();
             this.maskedTextBoxProxyPass = new System.Windows.Forms.MaskedTextBox();
             this.textBoxProxyUser = new System.Windows.Forms.TextBox();
@@ -64,15 +63,22 @@
             this.xmds1 = new XiboClient.xmds.xmds();
             this.buttonExit = new System.Windows.Forms.Button();
             this.button1 = new System.Windows.Forms.Button();
-            this.groupBox2.SuspendLayout();
+            this.tabControl1 = new System.Windows.Forms.TabControl();
+            this.tabPage1 = new System.Windows.Forms.TabPage();
+            this.tabPage2 = new System.Windows.Forms.TabPage();
+            this.label4 = new System.Windows.Forms.Label();
+            this.label5 = new System.Windows.Forms.Label();
             this.menuStrip1.SuspendLayout();
+            this.tabControl1.SuspendLayout();
+            this.tabPage1.SuspendLayout();
+            this.tabPage2.SuspendLayout();
             this.SuspendLayout();
             // 
             // label1
             // 
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label1.Location = new System.Drawing.Point(11, 46);
+            this.label1.Location = new System.Drawing.Point(99, 37);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(128, 22);
             this.label1.TabIndex = 1;
@@ -82,7 +88,7 @@
             // 
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label2.Location = new System.Drawing.Point(522, 46);
+            this.label2.Location = new System.Drawing.Point(184, 87);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(43, 22);
             this.label2.TabIndex = 3;
@@ -92,7 +98,7 @@
             // 
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label3.Location = new System.Drawing.Point(21, 92);
+            this.label3.Location = new System.Drawing.Point(109, 141);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(118, 22);
             this.label3.TabIndex = 5;
@@ -113,7 +119,7 @@
             // 
             this.label9.AutoSize = true;
             this.label9.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label9.Location = new System.Drawing.Point(468, 92);
+            this.label9.Location = new System.Drawing.Point(46, 174);
             this.label9.Name = "label9";
             this.label9.Size = new System.Drawing.Size(97, 22);
             this.label9.TabIndex = 13;
@@ -122,7 +128,7 @@
             // buttonLibrary
             // 
             this.buttonLibrary.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.buttonLibrary.Location = new System.Drawing.Point(353, 87);
+            this.buttonLibrary.Location = new System.Drawing.Point(441, 136);
             this.buttonLibrary.Name = "buttonLibrary";
             this.buttonLibrary.Size = new System.Drawing.Size(109, 31);
             this.buttonLibrary.TabIndex = 10;
@@ -133,32 +139,32 @@
             // tbHardwareKey
             // 
             this.tbHardwareKey.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.tbHardwareKey.Location = new System.Drawing.Point(571, 89);
+            this.tbHardwareKey.Location = new System.Drawing.Point(148, 171);
             this.tbHardwareKey.Name = "tbHardwareKey";
-            this.tbHardwareKey.Size = new System.Drawing.Size(116, 29);
+            this.tbHardwareKey.Size = new System.Drawing.Size(497, 29);
             this.tbHardwareKey.TabIndex = 14;
             // 
             // textBoxXmdsUri
             // 
             this.textBoxXmdsUri.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.textBoxXmdsUri.Location = new System.Drawing.Point(145, 43);
+            this.textBoxXmdsUri.Location = new System.Drawing.Point(233, 34);
             this.textBoxXmdsUri.Name = "textBoxXmdsUri";
-            this.textBoxXmdsUri.Size = new System.Drawing.Size(371, 29);
+            this.textBoxXmdsUri.Size = new System.Drawing.Size(317, 29);
             this.textBoxXmdsUri.TabIndex = 0;
             this.textBoxXmdsUri.Text = "http://localhost/xibo";
             // 
             // textBoxServerKey
             // 
             this.textBoxServerKey.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.textBoxServerKey.Location = new System.Drawing.Point(571, 43);
+            this.textBoxServerKey.Location = new System.Drawing.Point(233, 84);
             this.textBoxServerKey.Name = "textBoxServerKey";
-            this.textBoxServerKey.Size = new System.Drawing.Size(116, 29);
+            this.textBoxServerKey.Size = new System.Drawing.Size(317, 29);
             this.textBoxServerKey.TabIndex = 2;
             // 
             // textBoxLibraryPath
             // 
             this.textBoxLibraryPath.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.textBoxLibraryPath.Location = new System.Drawing.Point(145, 89);
+            this.textBoxLibraryPath.Location = new System.Drawing.Point(233, 138);
             this.textBoxLibraryPath.Name = "textBoxLibraryPath";
             this.textBoxLibraryPath.Size = new System.Drawing.Size(202, 29);
             this.textBoxLibraryPath.TabIndex = 4;
@@ -175,52 +181,36 @@
             this.buttonDisplayAdmin.UseVisualStyleBackColor = true;
             this.buttonDisplayAdmin.Click += new System.EventHandler(this.buttonDisplayAdmin_Click);
             // 
-            // groupBox2
-            // 
-            this.groupBox2.Controls.Add(this.textBoxProxyDomain);
-            this.groupBox2.Controls.Add(this.maskedTextBoxProxyPass);
-            this.groupBox2.Controls.Add(this.textBoxProxyUser);
-            this.groupBox2.Controls.Add(this.labelProxyDomain);
-            this.groupBox2.Controls.Add(this.labelProxyPass);
-            this.groupBox2.Controls.Add(this.labelProxyUser);
-            this.groupBox2.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.groupBox2.Location = new System.Drawing.Point(12, 263);
-            this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Size = new System.Drawing.Size(674, 150);
-            this.groupBox2.TabIndex = 7;
-            this.groupBox2.TabStop = false;
-            this.groupBox2.Text = "Proxy Information";
-            // 
             // textBoxProxyDomain
             // 
             this.textBoxProxyDomain.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.textBoxProxyDomain.Location = new System.Drawing.Point(110, 95);
+            this.textBoxProxyDomain.Location = new System.Drawing.Point(148, 120);
             this.textBoxProxyDomain.Name = "textBoxProxyDomain";
-            this.textBoxProxyDomain.Size = new System.Drawing.Size(558, 29);
+            this.textBoxProxyDomain.Size = new System.Drawing.Size(497, 29);
             this.textBoxProxyDomain.TabIndex = 7;
             // 
             // maskedTextBoxProxyPass
             // 
             this.maskedTextBoxProxyPass.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.maskedTextBoxProxyPass.Location = new System.Drawing.Point(441, 37);
+            this.maskedTextBoxProxyPass.Location = new System.Drawing.Point(148, 83);
             this.maskedTextBoxProxyPass.Name = "maskedTextBoxProxyPass";
-            this.maskedTextBoxProxyPass.Size = new System.Drawing.Size(227, 29);
+            this.maskedTextBoxProxyPass.Size = new System.Drawing.Size(497, 29);
             this.maskedTextBoxProxyPass.TabIndex = 5;
             this.maskedTextBoxProxyPass.UseSystemPasswordChar = true;
             // 
             // textBoxProxyUser
             // 
             this.textBoxProxyUser.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.textBoxProxyUser.Location = new System.Drawing.Point(110, 37);
+            this.textBoxProxyUser.Location = new System.Drawing.Point(148, 49);
             this.textBoxProxyUser.Name = "textBoxProxyUser";
-            this.textBoxProxyUser.Size = new System.Drawing.Size(225, 29);
+            this.textBoxProxyUser.Size = new System.Drawing.Size(497, 29);
             this.textBoxProxyUser.TabIndex = 3;
             // 
             // labelProxyDomain
             // 
             this.labelProxyDomain.AutoSize = true;
             this.labelProxyDomain.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.labelProxyDomain.Location = new System.Drawing.Point(29, 95);
+            this.labelProxyDomain.Location = new System.Drawing.Point(65, 123);
             this.labelProxyDomain.Name = "labelProxyDomain";
             this.labelProxyDomain.Size = new System.Drawing.Size(75, 22);
             this.labelProxyDomain.TabIndex = 2;
@@ -230,7 +220,7 @@
             // 
             this.labelProxyPass.AutoSize = true;
             this.labelProxyPass.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.labelProxyPass.Location = new System.Drawing.Point(341, 40);
+            this.labelProxyPass.Location = new System.Drawing.Point(46, 86);
             this.labelProxyPass.Name = "labelProxyPass";
             this.labelProxyPass.Size = new System.Drawing.Size(94, 22);
             this.labelProxyPass.TabIndex = 1;
@@ -240,7 +230,7 @@
             // 
             this.labelProxyUser.AutoSize = true;
             this.labelProxyUser.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.labelProxyUser.Location = new System.Drawing.Point(7, 40);
+            this.labelProxyUser.Location = new System.Drawing.Point(43, 52);
             this.labelProxyUser.Name = "labelProxyUser";
             this.labelProxyUser.Size = new System.Drawing.Size(97, 22);
             this.labelProxyUser.TabIndex = 0;
@@ -249,7 +239,7 @@
             // splashButtonBrowse
             // 
             this.splashButtonBrowse.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.splashButtonBrowse.Location = new System.Drawing.Point(353, 136);
+            this.splashButtonBrowse.Location = new System.Drawing.Point(536, 211);
             this.splashButtonBrowse.Name = "splashButtonBrowse";
             this.splashButtonBrowse.Size = new System.Drawing.Size(109, 29);
             this.splashButtonBrowse.TabIndex = 14;
@@ -261,7 +251,7 @@
             // 
             this.linkLabel1.AutoSize = true;
             this.linkLabel1.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.linkLabel1.Location = new System.Drawing.Point(246, 226);
+            this.linkLabel1.Location = new System.Drawing.Point(249, 283);
             this.linkLabel1.Name = "linkLabel1";
             this.linkLabel1.Size = new System.Drawing.Size(177, 18);
             this.linkLabel1.TabIndex = 13;
@@ -272,7 +262,7 @@
             // 
             this.label17.AutoSize = true;
             this.label17.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label17.Location = new System.Drawing.Point(95, 195);
+            this.label17.Location = new System.Drawing.Point(98, 252);
             this.label17.Name = "label17";
             this.label17.Size = new System.Drawing.Size(509, 18);
             this.label17.TabIndex = 12;
@@ -282,7 +272,7 @@
             // 
             this.label16.AutoSize = true;
             this.label16.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.label16.Location = new System.Drawing.Point(3, 139);
+            this.label16.Location = new System.Drawing.Point(6, 214);
             this.label16.Name = "label16";
             this.label16.Size = new System.Drawing.Size(134, 22);
             this.label16.TabIndex = 11;
@@ -291,9 +281,9 @@
             // splashOverride
             // 
             this.splashOverride.Font = new System.Drawing.Font("Arial", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.splashOverride.Location = new System.Drawing.Point(145, 136);
+            this.splashOverride.Location = new System.Drawing.Point(148, 211);
             this.splashOverride.Name = "splashOverride";
-            this.splashOverride.Size = new System.Drawing.Size(202, 29);
+            this.splashOverride.Size = new System.Drawing.Size(382, 29);
             this.splashOverride.TabIndex = 10;
             // 
             // menuStrip1
@@ -355,10 +345,10 @@
             this.tbStatus.BorderStyle = System.Windows.Forms.BorderStyle.None;
             this.tbStatus.Cursor = System.Windows.Forms.Cursors.Default;
             this.tbStatus.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.tbStatus.Location = new System.Drawing.Point(12, 431);
+            this.tbStatus.Location = new System.Drawing.Point(12, 391);
             this.tbStatus.Multiline = true;
             this.tbStatus.Name = "tbStatus";
-            this.tbStatus.Size = new System.Drawing.Size(674, 60);
+            this.tbStatus.Size = new System.Drawing.Size(674, 100);
             this.tbStatus.TabIndex = 15;
             // 
             // xmds1
@@ -389,40 +379,101 @@
             this.button1.UseVisualStyleBackColor = true;
             this.button1.Click += new System.EventHandler(this.button1_Click);
             // 
+            // tabControl1
+            // 
+            this.tabControl1.Controls.Add(this.tabPage1);
+            this.tabControl1.Controls.Add(this.tabPage2);
+            this.tabControl1.Location = new System.Drawing.Point(12, 40);
+            this.tabControl1.Name = "tabControl1";
+            this.tabControl1.SelectedIndex = 0;
+            this.tabControl1.Size = new System.Drawing.Size(675, 345);
+            this.tabControl1.TabIndex = 18;
+            // 
+            // tabPage1
+            // 
+            this.tabPage1.Controls.Add(this.label5);
+            this.tabPage1.Controls.Add(this.label1);
+            this.tabPage1.Controls.Add(this.textBoxLibraryPath);
+            this.tabPage1.Controls.Add(this.textBoxServerKey);
+            this.tabPage1.Controls.Add(this.label3);
+            this.tabPage1.Controls.Add(this.label2);
+            this.tabPage1.Controls.Add(this.textBoxXmdsUri);
+            this.tabPage1.Controls.Add(this.buttonLibrary);
+            this.tabPage1.Location = new System.Drawing.Point(4, 22);
+            this.tabPage1.Name = "tabPage1";
+            this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
+            this.tabPage1.Size = new System.Drawing.Size(667, 319);
+            this.tabPage1.TabIndex = 0;
+            this.tabPage1.Text = "Connect";
+            this.tabPage1.UseVisualStyleBackColor = true;
+            // 
+            // tabPage2
+            // 
+            this.tabPage2.Controls.Add(this.label4);
+            this.tabPage2.Controls.Add(this.textBoxProxyDomain);
+            this.tabPage2.Controls.Add(this.labelProxyUser);
+            this.tabPage2.Controls.Add(this.labelProxyDomain);
+            this.tabPage2.Controls.Add(this.maskedTextBoxProxyPass);
+            this.tabPage2.Controls.Add(this.splashButtonBrowse);
+            this.tabPage2.Controls.Add(this.textBoxProxyUser);
+            this.tabPage2.Controls.Add(this.label9);
+            this.tabPage2.Controls.Add(this.tbHardwareKey);
+            this.tabPage2.Controls.Add(this.labelProxyPass);
+            this.tabPage2.Controls.Add(this.linkLabel1);
+            this.tabPage2.Controls.Add(this.label16);
+            this.tabPage2.Controls.Add(this.label17);
+            this.tabPage2.Controls.Add(this.splashOverride);
+            this.tabPage2.Location = new System.Drawing.Point(4, 22);
+            this.tabPage2.Name = "tabPage2";
+            this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
+            this.tabPage2.Size = new System.Drawing.Size(667, 319);
+            this.tabPage2.TabIndex = 1;
+            this.tabPage2.Text = "Advanced";
+            this.tabPage2.UseVisualStyleBackColor = true;
+            // 
+            // label4
+            // 
+            this.label4.AutoSize = true;
+            this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.label4.Location = new System.Drawing.Point(144, 13);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(215, 24);
+            this.label4.TabIndex = 15;
+            this.label4.Text = "Proxy Server Information";
+            // 
+            // label5
+            // 
+            this.label5.AutoSize = true;
+            this.label5.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.label5.Location = new System.Drawing.Point(33, 231);
+            this.label5.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(604, 24);
+            this.label5.TabIndex = 15;
+            this.label5.Text = "Enter the CMS Address, Key and Local Library Location and click Save.";
+            // 
             // OptionForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(698, 561);
+            this.Controls.Add(this.tabControl1);
             this.Controls.Add(this.button1);
             this.Controls.Add(this.buttonExit);
             this.Controls.Add(this.tbStatus);
-            this.Controls.Add(this.splashButtonBrowse);
             this.Controls.Add(this.buttonDisplayAdmin);
-            this.Controls.Add(this.linkLabel1);
-            this.Controls.Add(this.groupBox2);
-            this.Controls.Add(this.label17);
             this.Controls.Add(this.menuStrip1);
-            this.Controls.Add(this.label16);
-            this.Controls.Add(this.splashOverride);
-            this.Controls.Add(this.label9);
             this.Controls.Add(this.buttonSaveSettings);
-            this.Controls.Add(this.tbHardwareKey);
-            this.Controls.Add(this.buttonLibrary);
-            this.Controls.Add(this.label1);
-            this.Controls.Add(this.textBoxXmdsUri);
-            this.Controls.Add(this.label2);
-            this.Controls.Add(this.label3);
-            this.Controls.Add(this.textBoxServerKey);
-            this.Controls.Add(this.textBoxLibraryPath);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.MainMenuStrip = this.menuStrip1;
             this.Name = "OptionForm";
             this.Text = "Xibo Client Options";
-            this.groupBox2.ResumeLayout(false);
-            this.groupBox2.PerformLayout();
             this.menuStrip1.ResumeLayout(false);
             this.menuStrip1.PerformLayout();
+            this.tabControl1.ResumeLayout(false);
+            this.tabPage1.ResumeLayout(false);
+            this.tabPage1.PerformLayout();
+            this.tabPage2.ResumeLayout(false);
+            this.tabPage2.PerformLayout();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -447,7 +498,6 @@
         private System.Windows.Forms.Button buttonLibrary;
         private System.Windows.Forms.ToolStripMenuItem onlineHelpToolStripMenuItem;
         private System.Windows.Forms.Button buttonDisplayAdmin;
-        private System.Windows.Forms.GroupBox groupBox2;
         private System.Windows.Forms.MaskedTextBox maskedTextBoxProxyPass;
         private System.Windows.Forms.TextBox textBoxProxyUser;
         private System.Windows.Forms.Label labelProxyDomain;
@@ -465,5 +515,10 @@
         private System.Windows.Forms.TextBox tbStatus;
         private System.Windows.Forms.Button buttonExit;
         private System.Windows.Forms.Button button1;
+        private System.Windows.Forms.TabControl tabControl1;
+        private System.Windows.Forms.TabPage tabPage1;
+        private System.Windows.Forms.Label label5;
+        private System.Windows.Forms.TabPage tabPage2;
+        private System.Windows.Forms.Label label4;
     }
 }
 \ No newline at end of file
 
=== modified file 'client/dotNET/Forms/OptionForm.cs'
--- client/dotNET/Forms/OptionForm.cs	2014-10-21 12:35:07 +0000
+++ client/dotNET/Forms/OptionForm.cs	2014-11-26 10:33:06 +0000
@@ -123,7 +123,7 @@
                 tbStatus.AppendText("Saving with CMS... Please wait...");
 
                 // Make sure our XMDS location is correct
-                ApplicationSettings.Default.XiboClient_xmds_xmds = textBoxXmdsUri.Text.TrimEnd('/') + @"/xmds.php";
+                ApplicationSettings.Default.XiboClient_xmds_xmds = textBoxXmdsUri.Text.TrimEnd('/') + @"/xmds.php?v=" + ApplicationSettings.Default.Version;
             
                 // Simple settings
                 ApplicationSettings.Default.ServerKey = textBoxServerKey.Text;
 
=== modified file 'client/dotNET/Forms/OptionForm.resx'
--- client/dotNET/Forms/OptionForm.resx	2014-08-29 19:31:56 +0000
+++ client/dotNET/Forms/OptionForm.resx	2014-11-26 10:33:06 +0000
@@ -112,24 +112,24 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>101, 17</value>
   </metadata>
-  <metadata name="folderBrowserLibrary.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="folderBrowserLibrary.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>210, 17</value>
   </metadata>
-  <metadata name="splashScreenOverride.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="splashScreenOverride.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>374, 17</value>
   </metadata>
-  <metadata name="xmds1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="xmds1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAABAAkAICAQAAEABADoAgAAlgAAABAQEAABAAQAKAEAAH4DAAAwMAAAAQAIAKgOAACmBAAAICAAAAEA
 
=== modified file 'client/dotNET/Log/StatLog.cs'
--- client/dotNET/Log/StatLog.cs	2014-10-10 13:15:40 +0000
+++ client/dotNET/Log/StatLog.cs	2014-11-26 10:33:06 +0000
@@ -228,7 +228,7 @@
 
                     try
                     {
-                        logtoXmds.SubmitStats(ApplicationSettings.Default.Version, ApplicationSettings.Default.ServerKey, _hardwareKey.Key, builder.ToString());
+                        logtoXmds.SubmitStats(ApplicationSettings.Default.ServerKey, _hardwareKey.Key, builder.ToString());
 
                         // Delete the file we are on
                         File.Delete(fileName);
 
=== modified file 'client/dotNET/Log/XiboTraceListener.cs'
--- client/dotNET/Log/XiboTraceListener.cs	2014-09-16 16:40:30 +0000
+++ client/dotNET/Log/XiboTraceListener.cs	2014-11-26 10:33:06 +0000
@@ -166,7 +166,7 @@
 
                     try
                     {
-                        logtoXmds.SubmitLog(ApplicationSettings.Default.Version, ApplicationSettings.Default.ServerKey, _hardwareKey.Key, builder.ToString());
+                        logtoXmds.SubmitLog(ApplicationSettings.Default.ServerKey, _hardwareKey.Key, builder.ToString());
 
                         // Delete the file we are on
                         File.Delete(fileName);
 
=== modified file 'client/dotNET/Logic/ApplicationSettings.cs'
--- client/dotNET/Logic/ApplicationSettings.cs	2014-10-21 12:14:16 +0000
+++ client/dotNET/Logic/ApplicationSettings.cs	2014-11-26 10:33:06 +0000
@@ -36,9 +36,9 @@
         private static string _default = "default";
 
         // Application Specific Settings we want to protect
-        private string _clientVersion = "1.7.0-alpha2";
+        private string _clientVersion = "1.7.0-beta";
         private string _version = "4";
-        private int _clientCodeVersion = 101;
+        private int _clientCodeVersion = 102;
 
         public string ClientVersion { get { return _clientVersion; } }
         public string Version { get { return _version; } }
 
=== modified file 'client/dotNET/Logic/ScreenShot.cs'
--- client/dotNET/Logic/ScreenShot.cs	2014-10-10 12:20:47 +0000
+++ client/dotNET/Logic/ScreenShot.cs	2014-11-26 10:33:06 +0000
@@ -32,7 +32,7 @@
                     {
                         screenShotXmds.Url = ApplicationSettings.Default.XiboClient_xmds_xmds;
                         screenShotXmds.SubmitScreenShotCompleted += screenShotXmds_SubmitScreenShotCompleted;
-                        screenShotXmds.SubmitScreenShotAsync(ApplicationSettings.Default.Version, ApplicationSettings.Default.ServerKey, ApplicationSettings.Default.HardwareKey, bytes);
+                        screenShotXmds.SubmitScreenShotAsync(ApplicationSettings.Default.ServerKey, ApplicationSettings.Default.HardwareKey, bytes);
                     }
                 }
             }
 
=== modified file 'client/dotNET/Media/PowerPoint.cs'
--- client/dotNET/Media/PowerPoint.cs	2014-09-01 13:33:50 +0000
+++ client/dotNET/Media/PowerPoint.cs	2014-11-26 10:33:06 +0000
@@ -53,11 +53,6 @@
             webBrowser.DocumentCompleted += new WebBrowserDocumentCompletedEventHandler(webBrowser_DocumentCompleted);
             webBrowser.Visible = false;
 
-            // Offset?
-            double offsetTop = Convert.ToDouble(options.Dictionary.Get("offsetTop", "0"));
-            double offsetLeft = Convert.ToDouble(options.Dictionary.Get("offsetLeft", "0"));
-            double scaling = Convert.ToDouble(options.Dictionary.Get("scaling", "100"));
-
             if (!ApplicationSettings.Default.PowerpointEnabled)
             {
                 webBrowser.DocumentText = "<html><body><h1>Powerpoint not enabled on this display</h1></body></html>";
@@ -92,12 +87,6 @@
             Show();
         }
 
-        public override void RenderMedia()
-        {
-            // do nothing
-            return;
-        }
-
         void webBrowser_DocumentCompleted(object sender, WebBrowserDocumentCompletedEventArgs e)
         {
             // Get ready to show the control
 
=== modified file 'client/dotNET/Media/Video.cs'
--- client/dotNET/Media/Video.cs	2014-08-29 19:31:56 +0000
+++ client/dotNET/Media/Video.cs	2014-11-26 10:33:06 +0000
@@ -53,6 +53,13 @@
             _videoPlayer.Height = options.height;
             _videoPlayer.Location = new System.Drawing.Point(0, 0);
 
+            // Should we loop?
+            if (options.Dictionary.Get("loop", "0") == "1" && _duration == 0)
+                _videoPlayer.SetLooping(true);
+
+            // Should we mute?
+            _videoPlayer.SetMute((options.Dictionary.Get("mute", "0") == "1"));
+
             // Capture any video errors
             _videoPlayer.VideoError += new VideoPlayer.VideoErrored(_videoPlayer_VideoError);
 
 
=== modified file 'client/dotNET/Media/VideoPlayer.cs'
--- client/dotNET/Media/VideoPlayer.cs	2014-08-29 19:31:56 +0000
+++ client/dotNET/Media/VideoPlayer.cs	2014-11-26 10:33:06 +0000
@@ -65,6 +65,19 @@
             axWindowsMediaPlayer1.ErrorEvent += new EventHandler(axWindowsMediaPlayer1_ErrorEvent);
         }
 
+        public void SetLooping(bool looping)
+        {
+            axWindowsMediaPlayer1.settings.setMode("loop", looping);
+        }
+
+        public void SetMute(bool mute)
+        {
+            if (mute)
+                axWindowsMediaPlayer1.settings.mute = true;
+            else
+                axWindowsMediaPlayer1.settings.volume = 100;
+        }
+
         void axWindowsMediaPlayer1_ErrorEvent(object sender, EventArgs e)
         {
             // Get the error for logging
 
=== modified file 'client/dotNET/Web References/xmds/Reference.cs'
--- client/dotNET/Web References/xmds/Reference.cs	2014-10-21 12:35:07 +0000
+++ client/dotNET/Web References/xmds/Reference.cs	2014-11-26 10:33:06 +0000
@@ -55,7 +55,7 @@
         
         /// <remarks/>
         public xmds() {
-            this.Url = "http://172.28.128.3/xmds.php";
+            this.Url = "http://172.28.128.3/xmds.php?v=4";
             if ((this.IsLocalFileSystemWebService(this.Url) == true)) {
                 this.UseDefaultCredentials = true;
                 this.useDefaultCredentialsSetExplicitly = false;
@@ -125,7 +125,7 @@
         /// <remarks/>
         [System.Web.Services.Protocols.SoapRpcMethodAttribute("urn:xmds#RegisterDisplay", RequestNamespace="urn:xmds", ResponseNamespace="urn:xmds")]
         [return: System.Xml.Serialization.SoapElementAttribute("ActivationMessage")]
-        public string RegisterDisplay(string serverKey, string hardwareKey, string displayName, string clientType, string clientVersion, int clientCode, string operatingSystem, string macAddress, string version) {
+        public string RegisterDisplay(string serverKey, string hardwareKey, string displayName, string clientType, string clientVersion, int clientCode, string operatingSystem, string macAddress) {
             object[] results = this.Invoke("RegisterDisplay", new object[] {
                         serverKey,
                         hardwareKey,
@@ -134,18 +134,17 @@
                         clientVersion,
                         clientCode,
                         operatingSystem,
-                        macAddress,
-                        version});
+                        macAddress});
             return ((string)(results[0]));
         }
         
         /// <remarks/>
-        public void RegisterDisplayAsync(string serverKey, string hardwareKey, string displayName, string clientType, string clientVersion, int clientCode, string operatingSystem, string macAddress, string version) {
-            this.RegisterDisplayAsync(serverKey, hardwareKey, displayName, clientType, clientVersion, clientCode, operatingSystem, macAddress, version, null);
+        public void RegisterDisplayAsync(string serverKey, string hardwareKey, string displayName, string clientType, string clientVersion, int clientCode, string operatingSystem, string macAddress) {
+            this.RegisterDisplayAsync(serverKey, hardwareKey, displayName, clientType, clientVersion, clientCode, operatingSystem, macAddress, null);
         }
         
         /// <remarks/>
-        public void RegisterDisplayAsync(string serverKey, string hardwareKey, string displayName, string clientType, string clientVersion, int clientCode, string operatingSystem, string macAddress, string version, object userState) {
+        public void RegisterDisplayAsync(string serverKey, string hardwareKey, string displayName, string clientType, string clientVersion, int clientCode, string operatingSystem, string macAddress, object userState) {
             if ((this.RegisterDisplayOperationCompleted == null)) {
                 this.RegisterDisplayOperationCompleted = new System.Threading.SendOrPostCallback(this.OnRegisterDisplayOperationCompleted);
             }
@@ -157,8 +156,7 @@
                         clientVersion,
                         clientCode,
                         operatingSystem,
-                        macAddress,
-                        version}, this.RegisterDisplayOperationCompleted, userState);
+                        macAddress}, this.RegisterDisplayOperationCompleted, userState);
         }
         
         private void OnRegisterDisplayOperationCompleted(object arg) {
@@ -171,28 +169,26 @@
         /// <remarks/>
         [System.Web.Services.Protocols.SoapRpcMethodAttribute("urn:xmds#RequiredFiles", RequestNamespace="urn:xmds", ResponseNamespace="urn:xmds")]
         [return: System.Xml.Serialization.SoapElementAttribute("RequiredFilesXml")]
-        public string RequiredFiles(string serverKey, string hardwareKey, string version) {
+        public string RequiredFiles(string serverKey, string hardwareKey) {
             object[] results = this.Invoke("RequiredFiles", new object[] {
                         serverKey,
-                        hardwareKey,
-                        version});
+                        hardwareKey});
             return ((string)(results[0]));
         }
         
         /// <remarks/>
-        public void RequiredFilesAsync(string serverKey, string hardwareKey, string version) {
-            this.RequiredFilesAsync(serverKey, hardwareKey, version, null);
+        public void RequiredFilesAsync(string serverKey, string hardwareKey) {
+            this.RequiredFilesAsync(serverKey, hardwareKey, null);
         }
         
         /// <remarks/>
-        public void RequiredFilesAsync(string serverKey, string hardwareKey, string version, object userState) {
+        public void RequiredFilesAsync(string serverKey, string hardwareKey, object userState) {
             if ((this.RequiredFilesOperationCompleted == null)) {
                 this.RequiredFilesOperationCompleted = new System.Threading.SendOrPostCallback(this.OnRequiredFilesOperationCompleted);
             }
             this.InvokeAsync("RequiredFiles", new object[] {
                         serverKey,
-                        hardwareKey,
-                        version}, this.RequiredFilesOperationCompleted, userState);
+                        hardwareKey}, this.RequiredFilesOperationCompleted, userState);
         }
         
         private void OnRequiredFilesOperationCompleted(object arg) {
@@ -205,25 +201,24 @@
         /// <remarks/>
         [System.Web.Services.Protocols.SoapRpcMethodAttribute("urn:xmds#GetFile", RequestNamespace="urn:xmds", ResponseNamespace="urn:xmds")]
         [return: System.Xml.Serialization.SoapElementAttribute("file", DataType="base64Binary")]
-        public byte[] GetFile(string serverKey, string hardwareKey, int fileId, string fileType, double chunkOffset, double chuckSize, string version) {
+        public byte[] GetFile(string serverKey, string hardwareKey, int fileId, string fileType, double chunkOffset, double chuckSize) {
             object[] results = this.Invoke("GetFile", new object[] {
                         serverKey,
                         hardwareKey,
                         fileId,
                         fileType,
                         chunkOffset,
-                        chuckSize,
-                        version});
+                        chuckSize});
             return ((byte[])(results[0]));
         }
         
         /// <remarks/>
-        public void GetFileAsync(string serverKey, string hardwareKey, int fileId, string fileType, double chunkOffset, double chuckSize, string version) {
-            this.GetFileAsync(serverKey, hardwareKey, fileId, fileType, chunkOffset, chuckSize, version, null);
+        public void GetFileAsync(string serverKey, string hardwareKey, int fileId, string fileType, double chunkOffset, double chuckSize) {
+            this.GetFileAsync(serverKey, hardwareKey, fileId, fileType, chunkOffset, chuckSize, null);
         }
         
         /// <remarks/>
-        public void GetFileAsync(string serverKey, string hardwareKey, int fileId, string fileType, double chunkOffset, double chuckSize, string version, object userState) {
+        public void GetFileAsync(string serverKey, string hardwareKey, int fileId, string fileType, double chunkOffset, double chuckSize, object userState) {
             if ((this.GetFileOperationCompleted == null)) {
                 this.GetFileOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetFileOperationCompleted);
             }
@@ -233,8 +228,7 @@
                         fileId,
                         fileType,
                         chunkOffset,
-                        chuckSize,
-                        version}, this.GetFileOperationCompleted, userState);
+                        chuckSize}, this.GetFileOperationCompleted, userState);
         }
         
         private void OnGetFileOperationCompleted(object arg) {
@@ -247,28 +241,26 @@
         /// <remarks/>
         [System.Web.Services.Protocols.SoapRpcMethodAttribute("urn:xmds#Schedule", RequestNamespace="urn:xmds", ResponseNamespace="urn:xmds")]
         [return: System.Xml.Serialization.SoapElementAttribute("ScheduleXml")]
-        public string Schedule(string serverKey, string hardwareKey, string version) {
+        public string Schedule(string serverKey, string hardwareKey) {
             object[] results = this.Invoke("Schedule", new object[] {
                         serverKey,
-                        hardwareKey,
-                        version});
+                        hardwareKey});
             return ((string)(results[0]));
         }
         
         /// <remarks/>
-        public void ScheduleAsync(string serverKey, string hardwareKey, string version) {
-            this.ScheduleAsync(serverKey, hardwareKey, version, null);
+        public void ScheduleAsync(string serverKey, string hardwareKey) {
+            this.ScheduleAsync(serverKey, hardwareKey, null);
         }
         
         /// <remarks/>
-        public void ScheduleAsync(string serverKey, string hardwareKey, string version, object userState) {
+        public void ScheduleAsync(string serverKey, string hardwareKey, object userState) {
             if ((this.ScheduleOperationCompleted == null)) {
                 this.ScheduleOperationCompleted = new System.Threading.SendOrPostCallback(this.OnScheduleOperationCompleted);
             }
             this.InvokeAsync("Schedule", new object[] {
                         serverKey,
-                        hardwareKey,
-                        version}, this.ScheduleOperationCompleted, userState);
+                        hardwareKey}, this.ScheduleOperationCompleted, userState);
         }
         
         private void OnScheduleOperationCompleted(object arg) {
@@ -281,24 +273,23 @@
         /// <remarks/>
         [System.Web.Services.Protocols.SoapRpcMethodAttribute("urn:xmds#BlackList", RequestNamespace="urn:xmds", ResponseNamespace="urn:xmds")]
         [return: System.Xml.Serialization.SoapElementAttribute("success")]
-        public bool BlackList(string serverKey, string hardwareKey, int mediaId, string type, string reason, string version) {
+        public bool BlackList(string serverKey, string hardwareKey, int mediaId, string type, string reason) {
             object[] results = this.Invoke("BlackList", new object[] {
                         serverKey,
                         hardwareKey,
                         mediaId,
                         type,
-                        reason,
-                        version});
+                        reason});
             return ((bool)(results[0]));
         }
         
         /// <remarks/>
-        public void BlackListAsync(string serverKey, string hardwareKey, int mediaId, string type, string reason, string version) {
-            this.BlackListAsync(serverKey, hardwareKey, mediaId, type, reason, version, null);
+        public void BlackListAsync(string serverKey, string hardwareKey, int mediaId, string type, string reason) {
+            this.BlackListAsync(serverKey, hardwareKey, mediaId, type, reason, null);
         }
         
         /// <remarks/>
-        public void BlackListAsync(string serverKey, string hardwareKey, int mediaId, string type, string reason, string version, object userState) {
+        public void BlackListAsync(string serverKey, string hardwareKey, int mediaId, string type, string reason, object userState) {
             if ((this.BlackListOperationCompleted == null)) {
                 this.BlackListOperationCompleted = new System.Threading.SendOrPostCallback(this.OnBlackListOperationCompleted);
             }
@@ -307,8 +298,7 @@
                         hardwareKey,
                         mediaId,
                         type,
-                        reason,
-                        version}, this.BlackListOperationCompleted, userState);
+                        reason}, this.BlackListOperationCompleted, userState);
         }
         
         private void OnBlackListOperationCompleted(object arg) {
@@ -321,9 +311,8 @@
         /// <remarks/>
         [System.Web.Services.Protocols.SoapRpcMethodAttribute("urn:xmds#SubmitLog", RequestNamespace="urn:xmds", ResponseNamespace="urn:xmds")]
         [return: System.Xml.Serialization.SoapElementAttribute("success")]
-        public bool SubmitLog(string version, string serverKey, string hardwareKey, string logXml) {
+        public bool SubmitLog(string serverKey, string hardwareKey, string logXml) {
             object[] results = this.Invoke("SubmitLog", new object[] {
-                        version,
                         serverKey,
                         hardwareKey,
                         logXml});
@@ -331,17 +320,16 @@
         }
         
         /// <remarks/>
-        public void SubmitLogAsync(string version, string serverKey, string hardwareKey, string logXml) {
-            this.SubmitLogAsync(version, serverKey, hardwareKey, logXml, null);
+        public void SubmitLogAsync(string serverKey, string hardwareKey, string logXml) {
+            this.SubmitLogAsync(serverKey, hardwareKey, logXml, null);
         }
         
         /// <remarks/>
-        public void SubmitLogAsync(string version, string serverKey, string hardwareKey, string logXml, object userState) {
+        public void SubmitLogAsync(string serverKey, string hardwareKey, string logXml, object userState) {
             if ((this.SubmitLogOperationCompleted == null)) {
                 this.SubmitLogOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSubmitLogOperationCompleted);
             }
             this.InvokeAsync("SubmitLog", new object[] {
-                        version,
                         serverKey,
                         hardwareKey,
                         logXml}, this.SubmitLogOperationCompleted, userState);
@@ -357,9 +345,8 @@
         /// <remarks/>
         [System.Web.Services.Protocols.SoapRpcMethodAttribute("urn:xmds#SubmitLog", RequestNamespace="urn:xmds", ResponseNamespace="urn:xmds")]
         [return: System.Xml.Serialization.SoapElementAttribute("success")]
-        public bool SubmitStats(string version, string serverKey, string hardwareKey, string statXml) {
+        public bool SubmitStats(string serverKey, string hardwareKey, string statXml) {
             object[] results = this.Invoke("SubmitStats", new object[] {
-                        version,
                         serverKey,
                         hardwareKey,
                         statXml});
@@ -367,17 +354,16 @@
         }
         
         /// <remarks/>
-        public void SubmitStatsAsync(string version, string serverKey, string hardwareKey, string statXml) {
-            this.SubmitStatsAsync(version, serverKey, hardwareKey, statXml, null);
+        public void SubmitStatsAsync(string serverKey, string hardwareKey, string statXml) {
+            this.SubmitStatsAsync(serverKey, hardwareKey, statXml, null);
         }
         
         /// <remarks/>
-        public void SubmitStatsAsync(string version, string serverKey, string hardwareKey, string statXml, object userState) {
+        public void SubmitStatsAsync(string serverKey, string hardwareKey, string statXml, object userState) {
             if ((this.SubmitStatsOperationCompleted == null)) {
                 this.SubmitStatsOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSubmitStatsOperationCompleted);
             }
             this.InvokeAsync("SubmitStats", new object[] {
-                        version,
                         serverKey,
                         hardwareKey,
                         statXml}, this.SubmitStatsOperationCompleted, userState);
@@ -393,9 +379,8 @@
         /// <remarks/>
         [System.Web.Services.Protocols.SoapRpcMethodAttribute("urn:xmds#MediaInventory", RequestNamespace="urn:xmds", ResponseNamespace="urn:xmds")]
         [return: System.Xml.Serialization.SoapElementAttribute("success")]
-        public bool MediaInventory(string version, string serverKey, string hardwareKey, [System.Xml.Serialization.SoapElementAttribute("mediaInventory")] string mediaInventory1) {
+        public bool MediaInventory(string serverKey, string hardwareKey, [System.Xml.Serialization.SoapElementAttribute("mediaInventory")] string mediaInventory1) {
             object[] results = this.Invoke("MediaInventory", new object[] {
-                        version,
                         serverKey,
                         hardwareKey,
                         mediaInventory1});
@@ -403,17 +388,16 @@
         }
         
         /// <remarks/>
-        public void MediaInventoryAsync(string version, string serverKey, string hardwareKey, string mediaInventory1) {
-            this.MediaInventoryAsync(version, serverKey, hardwareKey, mediaInventory1, null);
+        public void MediaInventoryAsync(string serverKey, string hardwareKey, string mediaInventory1) {
+            this.MediaInventoryAsync(serverKey, hardwareKey, mediaInventory1, null);
         }
         
         /// <remarks/>
-        public void MediaInventoryAsync(string version, string serverKey, string hardwareKey, string mediaInventory1, object userState) {
+        public void MediaInventoryAsync(string serverKey, string hardwareKey, string mediaInventory1, object userState) {
             if ((this.MediaInventoryOperationCompleted == null)) {
                 this.MediaInventoryOperationCompleted = new System.Threading.SendOrPostCallback(this.OnMediaInventoryOperationCompleted);
             }
             this.InvokeAsync("MediaInventory", new object[] {
-                        version,
                         serverKey,
                         hardwareKey,
                         mediaInventory1}, this.MediaInventoryOperationCompleted, userState);
@@ -429,24 +413,23 @@
         /// <remarks/>
         [System.Web.Services.Protocols.SoapRpcMethodAttribute("urn:xmds#GetResource", RequestNamespace="urn:xmds", ResponseNamespace="urn:xmds")]
         [return: System.Xml.Serialization.SoapElementAttribute("resource")]
-        public string GetResource(string serverKey, string hardwareKey, int layoutId, string regionId, string mediaId, string version) {
+        public string GetResource(string serverKey, string hardwareKey, int layoutId, string regionId, string mediaId) {
             object[] results = this.Invoke("GetResource", new object[] {
                         serverKey,
                         hardwareKey,
                         layoutId,
                         regionId,
-                        mediaId,
-                        version});
+                        mediaId});
             return ((string)(results[0]));
         }
         
         /// <remarks/>
-        public void GetResourceAsync(string serverKey, string hardwareKey, int layoutId, string regionId, string mediaId, string version) {
-            this.GetResourceAsync(serverKey, hardwareKey, layoutId, regionId, mediaId, version, null);
+        public void GetResourceAsync(string serverKey, string hardwareKey, int layoutId, string regionId, string mediaId) {
+            this.GetResourceAsync(serverKey, hardwareKey, layoutId, regionId, mediaId, null);
         }
         
         /// <remarks/>
-        public void GetResourceAsync(string serverKey, string hardwareKey, int layoutId, string regionId, string mediaId, string version, object userState) {
+        public void GetResourceAsync(string serverKey, string hardwareKey, int layoutId, string regionId, string mediaId, object userState) {
             if ((this.GetResourceOperationCompleted == null)) {
                 this.GetResourceOperationCompleted = new System.Threading.SendOrPostCallback(this.OnGetResourceOperationCompleted);
             }
@@ -455,8 +438,7 @@
                         hardwareKey,
                         layoutId,
                         regionId,
-                        mediaId,
-                        version}, this.GetResourceOperationCompleted, userState);
+                        mediaId}, this.GetResourceOperationCompleted, userState);
         }
         
         private void OnGetResourceOperationCompleted(object arg) {
@@ -469,9 +451,8 @@
         /// <remarks/>
         [System.Web.Services.Protocols.SoapRpcMethodAttribute("urn:xmds#NotifyStatus", RequestNamespace="urn:xmds", ResponseNamespace="urn:xmds")]
         [return: System.Xml.Serialization.SoapElementAttribute("success")]
-        public bool NotifyStatus(string version, string serverKey, string hardwareKey, string status) {
+        public bool NotifyStatus(string serverKey, string hardwareKey, string status) {
             object[] results = this.Invoke("NotifyStatus", new object[] {
-                        version,
                         serverKey,
                         hardwareKey,
                         status});
@@ -479,17 +460,16 @@
         }
         
         /// <remarks/>
-        public void NotifyStatusAsync(string version, string serverKey, string hardwareKey, string status) {
-            this.NotifyStatusAsync(version, serverKey, hardwareKey, status, null);
+        public void NotifyStatusAsync(string serverKey, string hardwareKey, string status) {
+            this.NotifyStatusAsync(serverKey, hardwareKey, status, null);
         }
         
         /// <remarks/>
-        public void NotifyStatusAsync(string version, string serverKey, string hardwareKey, string status, object userState) {
+        public void NotifyStatusAsync(string serverKey, string hardwareKey, string status, object userState) {
             if ((this.NotifyStatusOperationCompleted == null)) {
                 this.NotifyStatusOperationCompleted = new System.Threading.SendOrPostCallback(this.OnNotifyStatusOperationCompleted);
             }
             this.InvokeAsync("NotifyStatus", new object[] {
-                        version,
                         serverKey,
                         hardwareKey,
                         status}, this.NotifyStatusOperationCompleted, userState);
@@ -505,9 +485,8 @@
         /// <remarks/>
         [System.Web.Services.Protocols.SoapRpcMethodAttribute("urn:xmds#SubmitScreenShot", RequestNamespace="urn:xmds", ResponseNamespace="urn:xmds")]
         [return: System.Xml.Serialization.SoapElementAttribute("success")]
-        public bool SubmitScreenShot(string version, string serverKey, string hardwareKey, [System.Xml.Serialization.SoapElementAttribute(DataType="base64Binary")] byte[] screenShot) {
+        public bool SubmitScreenShot(string serverKey, string hardwareKey, [System.Xml.Serialization.SoapElementAttribute(DataType="base64Binary")] byte[] screenShot) {
             object[] results = this.Invoke("SubmitScreenShot", new object[] {
-                        version,
                         serverKey,
                         hardwareKey,
                         screenShot});
@@ -515,17 +494,16 @@
         }
         
         /// <remarks/>
-        public void SubmitScreenShotAsync(string version, string serverKey, string hardwareKey, byte[] screenShot) {
-            this.SubmitScreenShotAsync(version, serverKey, hardwareKey, screenShot, null);
+        public void SubmitScreenShotAsync(string serverKey, string hardwareKey, byte[] screenShot) {
+            this.SubmitScreenShotAsync(serverKey, hardwareKey, screenShot, null);
         }
         
         /// <remarks/>
-        public void SubmitScreenShotAsync(string version, string serverKey, string hardwareKey, byte[] screenShot, object userState) {
+        public void SubmitScreenShotAsync(string serverKey, string hardwareKey, byte[] screenShot, object userState) {
             if ((this.SubmitScreenShotOperationCompleted == null)) {
                 this.SubmitScreenShotOperationCompleted = new System.Threading.SendOrPostCallback(this.OnSubmitScreenShotOperationCompleted);
             }
             this.InvokeAsync("SubmitScreenShot", new object[] {
-                        version,
                         serverKey,
                         hardwareKey,
                         screenShot}, this.SubmitScreenShotOperationCompleted, userState);
 
=== modified file 'client/dotNET/Web References/xmds/Reference.map'
--- client/dotNET/Web References/xmds/Reference.map	2014-10-14 16:39:35 +0000
+++ client/dotNET/Web References/xmds/Reference.map	2014-11-26 10:33:06 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <DiscoveryClientResultsFile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <Results>
-    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://172.28.128.3/xmds.php?WSDL" filename="xmds.wsdl" />
+    <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://172.28.128.3/xmds.php?v=4&amp;WSDL" filename="xmds.wsdl" />
   </Results>
 </DiscoveryClientResultsFile>
 \ No newline at end of file
 
=== modified file 'client/dotNET/Web References/xmds/xmds.wsdl'
--- client/dotNET/Web References/xmds/xmds.wsdl	2014-10-21 12:35:07 +0000
+++ client/dotNET/Web References/xmds/xmds.wsdl	2014-11-26 10:33:06 +0000
@@ -15,7 +15,6 @@
     <wsdl:part name="clientCode" type="xsd:int" />
     <wsdl:part name="operatingSystem" type="xsd:string" />
     <wsdl:part name="macAddress" type="xsd:string" />
-    <wsdl:part name="version" type="xsd:string" />
   </wsdl:message>
   <wsdl:message name="RegisterDisplayResponse">
     <wsdl:part name="ActivationMessage" type="xsd:string" />
@@ -23,7 +22,6 @@
   <wsdl:message name="RequiredFilesRequest">
     <wsdl:part name="serverKey" type="xsd:string" />
     <wsdl:part name="hardwareKey" type="xsd:string" />
-    <wsdl:part name="version" type="xsd:string" />
   </wsdl:message>
   <wsdl:message name="RequiredFilesResponse">
     <wsdl:part name="RequiredFilesXml" type="xsd:string" />
@@ -35,7 +33,6 @@
     <wsdl:part name="fileType" type="xsd:string" />
     <wsdl:part name="chunkOffset" type="xsd:double" />
     <wsdl:part name="chuckSize" type="xsd:double" />
-    <wsdl:part name="version" type="xsd:string" />
   </wsdl:message>
   <wsdl:message name="GetFileResponse">
     <wsdl:part name="file" type="xsd:base64Binary" />
@@ -43,7 +40,6 @@
   <wsdl:message name="ScheduleRequest">
     <wsdl:part name="serverKey" type="xsd:string" />
     <wsdl:part name="hardwareKey" type="xsd:string" />
-    <wsdl:part name="version" type="xsd:string" />
   </wsdl:message>
   <wsdl:message name="ScheduleResponse">
     <wsdl:part name="ScheduleXml" type="xsd:string" />
@@ -54,13 +50,11 @@
     <wsdl:part name="mediaId" type="xsd:int" />
     <wsdl:part name="type" type="xsd:string" />
     <wsdl:part name="reason" type="xsd:string" />
-    <wsdl:part name="version" type="xsd:string" />
   </wsdl:message>
   <wsdl:message name="BlackListResponse">
     <wsdl:part name="success" type="xsd:boolean" />
   </wsdl:message>
   <wsdl:message name="SubmitLogRequest">
-    <wsdl:part name="version" type="xsd:string" />
     <wsdl:part name="serverKey" type="xsd:string" />
     <wsdl:part name="hardwareKey" type="xsd:string" />
     <wsdl:part name="logXml" type="xsd:string" />
@@ -69,7 +63,6 @@
     <wsdl:part name="success" type="xsd:boolean" />
   </wsdl:message>
   <wsdl:message name="SubmitStatsRequest">
-    <wsdl:part name="version" type="xsd:string" />
     <wsdl:part name="serverKey" type="xsd:string" />
     <wsdl:part name="hardwareKey" type="xsd:string" />
     <wsdl:part name="statXml" type="xsd:string" />
@@ -78,7 +71,6 @@
     <wsdl:part name="success" type="xsd:boolean" />
   </wsdl:message>
   <wsdl:message name="MediaInventoryRequest">
-    <wsdl:part name="version" type="xsd:string" />
     <wsdl:part name="serverKey" type="xsd:string" />
     <wsdl:part name="hardwareKey" type="xsd:string" />
     <wsdl:part name="mediaInventory" type="xsd:string" />
@@ -92,13 +84,11 @@
     <wsdl:part name="layoutId" type="xsd:int" />
     <wsdl:part name="regionId" type="xsd:string" />
     <wsdl:part name="mediaId" type="xsd:string" />
-    <wsdl:part name="version" type="xsd:string" />
   </wsdl:message>
   <wsdl:message name="GetResourceResponse">
     <wsdl:part name="resource" type="xsd:string" />
   </wsdl:message>
   <wsdl:message name="NotifyStatusRequest">
-    <wsdl:part name="version" type="xsd:string" />
     <wsdl:part name="serverKey" type="xsd:string" />
     <wsdl:part name="hardwareKey" type="xsd:string" />
     <wsdl:part name="status" type="xsd:string" />
@@ -107,7 +97,6 @@
     <wsdl:part name="success" type="xsd:boolean" />
   </wsdl:message>
   <wsdl:message name="SubmitScreenShotRequest">
-    <wsdl:part name="version" type="xsd:string" />
     <wsdl:part name="serverKey" type="xsd:string" />
     <wsdl:part name="hardwareKey" type="xsd:string" />
     <wsdl:part name="screenShot" type="xsd:base64Binary" />
@@ -276,7 +265,7 @@
   </wsdl:binding>
   <wsdl:service name="xmds">
     <wsdl:port name="xmdsPort" binding="tns:xmdsBinding">
-      <soap:address location="http://172.28.128.3/xmds.php" />
+      <soap:address location="http://172.28.128.3/xmds.php?v=4" />
     </wsdl:port>
   </wsdl:service>
 </wsdl:definitions>
 \ No newline at end of file
 
=== modified file 'client/dotNET/XiboClient.csproj'
--- client/dotNET/XiboClient.csproj	2014-10-14 16:39:35 +0000
+++ client/dotNET/XiboClient.csproj	2014-11-26 10:33:06 +0000
@@ -262,10 +262,10 @@
     <WebReferences Include="Web References\" />
   </ItemGroup>
   <ItemGroup>
-    <WebReferenceUrl Include="http://172.28.128.3/xmds.php%3fWSDL">
+    <WebReferenceUrl Include="http://172.28.128.3/xmds.php%3fv=4&amp;WSDL">
       <UrlBehavior>Static</UrlBehavior>
       <RelPath>Web References\xmds\</RelPath>
-      <UpdateFromURL>http://172.28.128.3/xmds.php%3fWSDL</UpdateFromURL>
+      <UpdateFromURL>http://172.28.128.3/xmds.php%3fv=4&amp;WSDL</UpdateFromURL>
       <ServiceLocationURL>
       </ServiceLocationURL>
       <CachedDynamicPropName>
 
=== modified file 'client/dotNET/XmdsAgents/FileAgent.cs'
--- client/dotNET/XmdsAgents/FileAgent.cs	2014-10-14 16:39:35 +0000
+++ client/dotNET/XmdsAgents/FileAgent.cs	2014-11-26 10:33:06 +0000
@@ -147,7 +147,7 @@
                         xmds.Url = ApplicationSettings.Default.XiboClient_xmds_xmds;
                         xmds.UseDefaultCredentials = true;
 
-                        string result = xmds.GetResource(ApplicationSettings.Default.ServerKey, ApplicationSettings.Default.HardwareKey, file.LayoutId, file.RegionId, file.MediaId, ApplicationSettings.Default.Version);
+                        string result = xmds.GetResource(ApplicationSettings.Default.ServerKey, ApplicationSettings.Default.HardwareKey, file.LayoutId, file.RegionId, file.MediaId);
 
                         // Write the result to disk
                         using (StreamWriter sw = new StreamWriter(File.Open(ApplicationSettings.Default.LibraryPath + @"\" + file.SaveAs, FileMode.Create, FileAccess.Write, FileShare.Read)))
@@ -204,7 +204,7 @@
                             xmds.Url = ApplicationSettings.Default.XiboClient_xmds_xmds;
                             xmds.UseDefaultCredentials = false;
 
-                            getFileReturn = xmds.GetFile(ApplicationSettings.Default.ServerKey, _hardwareKey, file.Id, file.FileType, file.ChunkOffset, file.ChunkSize, ApplicationSettings.Default.Version);
+                            getFileReturn = xmds.GetFile(ApplicationSettings.Default.ServerKey, _hardwareKey, file.Id, file.FileType, file.ChunkOffset, file.ChunkSize);
                         }
 
                         // Set the flag to indicate we have a connection to XMDS
 
=== modified file 'client/dotNET/XmdsAgents/RegisterAgent.cs'
--- client/dotNET/XmdsAgents/RegisterAgent.cs	2014-10-21 12:35:07 +0000
+++ client/dotNET/XmdsAgents/RegisterAgent.cs	2014-11-26 10:33:06 +0000
@@ -71,7 +71,7 @@
                             xmds.Url = ApplicationSettings.Default.XiboClient_xmds_xmds;
                             xmds.UseDefaultCredentials = false;
 
-                            RegisterAgent.ProcessRegisterXml(xmds.RegisterDisplay(ApplicationSettings.Default.ServerKey, key.Key, ApplicationSettings.Default.DisplayName, "windows", ApplicationSettings.Default.ClientVersion, ApplicationSettings.Default.ClientCodeVersion, Environment.OSVersion.ToString(), key.MacAddress, ApplicationSettings.Default.Version));
+                            RegisterAgent.ProcessRegisterXml(xmds.RegisterDisplay(ApplicationSettings.Default.ServerKey, key.Key, ApplicationSettings.Default.DisplayName, "windows", ApplicationSettings.Default.ClientVersion, ApplicationSettings.Default.ClientCodeVersion, Environment.OSVersion.ToString(), key.MacAddress));
 
                             // Set the flag to indicate we have a connection to XMDS
                             ApplicationSettings.Default.XmdsLastConnection = DateTime.Now;
 
=== modified file 'client/dotNET/XmdsAgents/RequiredFilesAgent.cs'
--- client/dotNET/XmdsAgents/RequiredFilesAgent.cs	2014-08-28 12:59:20 +0000
+++ client/dotNET/XmdsAgents/RequiredFilesAgent.cs	2014-11-26 10:33:06 +0000
@@ -138,7 +138,7 @@
                                 xmds.UseDefaultCredentials = false;
 
                                 // Get required files from XMDS
-                                string requiredFilesXml = xmds.RequiredFiles(ApplicationSettings.Default.ServerKey, _hardwareKey, ApplicationSettings.Default.Version);
+                                string requiredFilesXml = xmds.RequiredFiles(ApplicationSettings.Default.ServerKey, _hardwareKey);
 
                                 // Set the flag to indicate we have a connection to XMDS
                                 ApplicationSettings.Default.XmdsLastConnection = DateTime.Now;
 
=== modified file 'client/dotNET/XmdsAgents/ScheduleAgent.cs'
--- client/dotNET/XmdsAgents/ScheduleAgent.cs	2014-08-27 14:37:13 +0000
+++ client/dotNET/XmdsAgents/ScheduleAgent.cs	2014-11-26 10:33:06 +0000
@@ -121,7 +121,7 @@
                             xmds.Url = ApplicationSettings.Default.XiboClient_xmds_xmds;
                             xmds.UseDefaultCredentials = false;
 
-                            string scheduleXml = xmds.Schedule(ApplicationSettings.Default.ServerKey, _hardwareKey, ApplicationSettings.Default.Version);
+                            string scheduleXml = xmds.Schedule(ApplicationSettings.Default.ServerKey, _hardwareKey);
 
                             // Set the flag to indicate we have a connection to XMDS
                             ApplicationSettings.Default.XmdsLastConnection = DateTime.Now;