Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser into dev

MediaBrowser.Server.Mac/Emby.Server.Mac.csproj

@@ -8,7 +8,7 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>MediaBrowser.Server.Mac</RootNamespace>
     <MonoMacResourcePrefix>Resources</MonoMacResourcePrefix>
-    <AssemblyName>MediaBrowser.Server.Mac</AssemblyName>
+    <AssemblyName>Emby.Server.Mac</AssemblyName>
     <ApplicationIcon>..\MediaBrowser.WebDashboard\dashboard-ui\css\images\favicon.ico</ApplicationIcon>
     <ReleaseVersion>
     </ReleaseVersion>
@@ -3250,9 +3250,6 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\nowplayingbar.css">
       <Link>Resources\dashboard-ui\css\nowplayingbar.css</Link>
     </BundleResource>
-    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\pluginupdates.css">
-      <Link>Resources\dashboard-ui\css\pluginupdates.css</Link>
-    </BundleResource>
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\remotecontrol.css">
       <Link>Resources\dashboard-ui\css\remotecontrol.css</Link>
     </BundleResource>