Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

MediaBrowser.Installer/MainWindow.xaml.cs

@@ -118,6 +118,8 @@ namespace MediaBrowser.Installer
                 {
                     // wasn't running
                 }
+
+                Thread.Sleep(500); // give it just another sec to be sure its really gone
             }
 
             //MessageBox.Show(string.Format("Called with args: product: {0} archive: {1} caller: {2}", product, Archive, callerId));
@@ -168,7 +170,7 @@ namespace MediaBrowser.Installer
                         client.UploadString("http://localhost:8096/mediabrowser/System/Shutdown", "");
                         try
                         {
-                            server.WaitForExit();
+                            server.WaitForExit(30000); //don't hang indefinitely
                         }
                         catch (ArgumentException)
                         {

MediaBrowser.Installer/MediaBrowser.Installer.csproj

@@ -31,7 +31,7 @@
     <PublisherName>Media Browser Team</PublisherName>
     <SuiteName>Media Browser</SuiteName>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
-    <ApplicationRevision>53</ApplicationRevision>
+    <ApplicationRevision>55</ApplicationRevision>
     <ApplicationVersion>0.1.1.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>