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

MediaBrowser.Controller/Entities/BaseItem.cs

@@ -313,7 +313,7 @@ namespace MediaBrowser.Controller.Entities
             var path = Path;
 
             // non file-system entries will not have a path
-            if (string.IsNullOrEmpty(path))
+            if (this.LocationType != LocationType.FileSystem || string.IsNullOrEmpty(path))
             {
                 return new ItemResolveArgs(ConfigurationManager.ApplicationPaths)
                 {

MediaBrowser.Installer/MediaBrowser.Installer.csproj

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

MediaBrowser.Uninstaller.Execute/MainWindow.xaml.cs

@@ -52,7 +52,7 @@ namespace MediaBrowser.Uninstaller.Execute
 
                 case "mbt":
                     Product = "Theater";
-                    RootSuffix = "-UI";
+                    RootSuffix = "-Theater";
                     break;
 
                 default: