Merge pull request #1118 from MediaBrowser/dev

3.0.5641.4

3 files changed, 132 insertions, 77 deletions

diff --git a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
index 003e63c34..4ea7d7c69 100644
--- a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
+++ b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
@@ -259,9 +259,6 @@
     </BundleResource>

     <BundleResource Include="Resources\appicon.icns" />

     <BundleResource Include="Resources\MediaBrowser.Server.Mac\Images.xcassets\AppIcon.appiconset\Contents.json" />

-    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\.DS_Store">

-      <Link>Resources\dashboard-ui\.DS_Store</Link>

-    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\about.html">

       <Link>Resources\dashboard-ui\about.html</Link>

     </BundleResource>

@@ -655,9 +652,6 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\wizarduser.html">

       <Link>Resources\dashboard-ui\wizarduser.html</Link>

     </BundleResource>

-    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\.DS_Store">

-      <Link>Resources\dashboard-ui\css\.DS_Store</Link>

-    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\card.css">

       <Link>Resources\dashboard-ui\css\card.css</Link>

     </BundleResource>

@@ -787,45 +781,6 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\userflyoutdefault.png">

       <Link>Resources\dashboard-ui\css\images\userflyoutdefault.png</Link>

     </BundleResource>

-    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\chromecast\ic_media_route_disabled_holo_dark.png">

-      <Link>Resources\dashboard-ui\css\images\chromecast\ic_media_route_disabled_holo_dark.png</Link>

-    </BundleResource>

-    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\chromecast\ic_media_route_disabled_holo_light.png">

-      <Link>Resources\dashboard-ui\css\images\chromecast\ic_media_route_disabled_holo_light.png</Link>

-    </BundleResource>

-    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\chromecast\ic_media_route_off_holo_dark.png">

-      <Link>Resources\dashboard-ui\css\images\chromecast\ic_media_route_off_holo_dark.png</Link>

-    </BundleResource>

-    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\chromecast\ic_media_route_off_holo_light.png">

-      <Link>Resources\dashboard-ui\css\images\chromecast\ic_media_route_off_holo_light.png</Link>

-    </BundleResource>

-    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\chromecast\ic_media_route_on_0_holo_dark.png">

-      <Link>Resources\dashboard-ui\css\images\chromecast\ic_media_route_on_0_holo_dark.png</Link>

-    </BundleResource>

-    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\chromecast\ic_media_route_on_0_holo_light.png">

-      <Link>Resources\dashboard-ui\css\images\chromecast\ic_media_route_on_0_holo_light.png</Link>

-    </BundleResource>

-    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\chromecast\ic_media_route_on_1_holo_dark.png">

-      <Link>Resources\dashboard-ui\css\images\chromecast\ic_media_route_on_1_holo_dark.png</Link>

-    </BundleResource>

-    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\chromecast\ic_media_route_on_1_holo_light.png">

-      <Link>Resources\dashboard-ui\css\images\chromecast\ic_media_route_on_1_holo_light.png</Link>

-    </BundleResource>

-    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\chromecast\ic_media_route_on_2_holo_dark.png">

-      <Link>Resources\dashboard-ui\css\images\chromecast\ic_media_route_on_2_holo_dark.png</Link>

-    </BundleResource>

-    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\chromecast\ic_media_route_on_2_holo_light.png">

-      <Link>Resources\dashboard-ui\css\images\chromecast\ic_media_route_on_2_holo_light.png</Link>

-    </BundleResource>

-    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\chromecast\ic_media_route_on_holo_dark.png">

-      <Link>Resources\dashboard-ui\css\images\chromecast\ic_media_route_on_holo_dark.png</Link>

-    </BundleResource>

-    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\chromecast\ic_media_route_on_holo_light.png">

-      <Link>Resources\dashboard-ui\css\images\chromecast\ic_media_route_on_holo_light.png</Link>

-    </BundleResource>

-    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\chromecast\ic_notification_media_route.png">

-      <Link>Resources\dashboard-ui\css\images\chromecast\ic_notification_media_route.png</Link>

-    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\clients\amazon.png">

       <Link>Resources\dashboard-ui\css\images\clients\amazon.png</Link>

     </BundleResource>

@@ -841,6 +796,9 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\clients\chrome_companion.png">

       <Link>Resources\dashboard-ui\css\images\clients\chrome_companion.png</Link>

     </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\clients\chromecast.png">

+      <Link>Resources\dashboard-ui\css\images\clients\chromecast.png</Link>

+    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\clients\dlna.png">

       <Link>Resources\dashboard-ui\css\images\clients\dlna.png</Link>

     </BundleResource>

@@ -865,12 +823,6 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\clients\mbc.png">

       <Link>Resources\dashboard-ui\css\images\clients\mbc.png</Link>

     </BundleResource>

-    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\clients\mbkinect.png">

-      <Link>Resources\dashboard-ui\css\images\clients\mbkinect.png</Link>

-    </BundleResource>

-    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\clients\mediaportal.png">

-      <Link>Resources\dashboard-ui\css\images\clients\mediaportal.png</Link>

-    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\clients\nuvue.png">

       <Link>Resources\dashboard-ui\css\images\clients\nuvue.png</Link>

     </BundleResource>

@@ -1009,9 +961,6 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\items\searchhintsv2\tv.png">

       <Link>Resources\dashboard-ui\css\images\items\searchhintsv2\tv.png</Link>

     </BundleResource>

-    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\kids\bg.jpg">

-      <Link>Resources\dashboard-ui\css\images\kids\bg.jpg</Link>

-    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\css\images\media\chapterflyout.png">

       <Link>Resources\dashboard-ui\css\images\media\chapterflyout.png</Link>

     </BundleResource>

@@ -1150,6 +1099,9 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\appservices.js">

       <Link>Resources\dashboard-ui\scripts\appservices.js</Link>

     </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\appsettings.js">

+      <Link>Resources\dashboard-ui\scripts\appsettings.js</Link>

+    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\autoorganizelog.js">

       <Link>Resources\dashboard-ui\scripts\autoorganizelog.js</Link>

     </BundleResource>

@@ -1267,6 +1219,9 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\homelatest.js">

       <Link>Resources\dashboard-ui\scripts\homelatest.js</Link>

     </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\htmlmediarenderer.js">

+      <Link>Resources\dashboard-ui\scripts\htmlmediarenderer.js</Link>

+    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\indexpage.js">

       <Link>Resources\dashboard-ui\scripts\indexpage.js</Link>

     </BundleResource>

@@ -1420,6 +1375,9 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\musicvideos.js">

       <Link>Resources\dashboard-ui\scripts\musicvideos.js</Link>

     </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\mypreferencescommon.js">

+      <Link>Resources\dashboard-ui\scripts\mypreferencescommon.js</Link>

+    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\mypreferencesdisplay.js">

       <Link>Resources\dashboard-ui\scripts\mypreferencesdisplay.js</Link>

     </BundleResource>

@@ -1495,6 +1453,9 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\search.js">

       <Link>Resources\dashboard-ui\scripts\search.js</Link>

     </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\sections.js">

+      <Link>Resources\dashboard-ui\scripts\sections.js</Link>

+    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\scripts\selectserver.js">

       <Link>Resources\dashboard-ui\scripts\selectserver.js</Link>

     </BundleResource>

@@ -1600,6 +1561,9 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\fastclick.js">

       <Link>Resources\dashboard-ui\thirdparty\fastclick.js</Link>

     </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\filesystem.js">

+      <Link>Resources\dashboard-ui\thirdparty\filesystem.js</Link>

+    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\headroom.js">

       <Link>Resources\dashboard-ui\thirdparty\headroom.js</Link>

     </BundleResource>

@@ -1618,6 +1582,9 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\requirecss.js">

       <Link>Resources\dashboard-ui\thirdparty\requirecss.js</Link>

     </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\velocity.min.js">

+      <Link>Resources\dashboard-ui\thirdparty\velocity.min.js</Link>

+    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\apiclient\ajax.js">

       <Link>Resources\dashboard-ui\thirdparty\apiclient\ajax.js</Link>

     </BundleResource>

@@ -1642,15 +1609,15 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\apiclient\events.js">

       <Link>Resources\dashboard-ui\thirdparty\apiclient\events.js</Link>

     </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\apiclient\localassetmanager.js">

+      <Link>Resources\dashboard-ui\thirdparty\apiclient\localassetmanager.js</Link>

+    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\apiclient\logger.js">

       <Link>Resources\dashboard-ui\thirdparty\apiclient\logger.js</Link>

     </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\apiclient\md5.js">

       <Link>Resources\dashboard-ui\thirdparty\apiclient\md5.js</Link>

     </BundleResource>

-    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\apiclient\network.js">

-      <Link>Resources\dashboard-ui\thirdparty\apiclient\network.js</Link>

-    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\apiclient\serverdiscovery.js">

       <Link>Resources\dashboard-ui\thirdparty\apiclient\serverdiscovery.js</Link>

     </BundleResource>

@@ -1660,6 +1627,9 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\apiclient\store.js">

       <Link>Resources\dashboard-ui\thirdparty\apiclient\store.js</Link>

     </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\apiclient\wakeonlan.js">

+      <Link>Resources\dashboard-ui\thirdparty\apiclient\wakeonlan.js</Link>

+    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\apiclient\alt\ajax.js">

       <Link>Resources\dashboard-ui\thirdparty\apiclient\alt\ajax.js</Link>

     </BundleResource>

@@ -1672,6 +1642,9 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\apiclient\alt\events.js">

       <Link>Resources\dashboard-ui\thirdparty\apiclient\alt\events.js</Link>

     </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\cordova\back.js">

+      <Link>Resources\dashboard-ui\thirdparty\cordova\back.js</Link>

+    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\cordova\chromecast.js">

       <Link>Resources\dashboard-ui\thirdparty\cordova\chromecast.js</Link>

     </BundleResource>

@@ -1681,9 +1654,15 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\cordova\externalplayer.js">

       <Link>Resources\dashboard-ui\thirdparty\cordova\externalplayer.js</Link>

     </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\cordova\filesystem.js">

+      <Link>Resources\dashboard-ui\thirdparty\cordova\filesystem.js</Link>

+    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\cordova\generaldevice.js">

       <Link>Resources\dashboard-ui\thirdparty\cordova\generaldevice.js</Link>

     </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\cordova\iap.js">

+      <Link>Resources\dashboard-ui\thirdparty\cordova\iap.js</Link>

+    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\cordova\imagestore.js">

       <Link>Resources\dashboard-ui\thirdparty\cordova\imagestore.js</Link>

     </BundleResource>

@@ -1696,9 +1675,42 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\cordova\serverdiscovery.js">

       <Link>Resources\dashboard-ui\thirdparty\cordova\serverdiscovery.js</Link>

     </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\cordova\volume.js">

+      <Link>Resources\dashboard-ui\thirdparty\cordova\volume.js</Link>

+    </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\cordova\wakeonlan.js">

+      <Link>Resources\dashboard-ui\thirdparty\cordova\wakeonlan.js</Link>

+    </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\cordova\android\androidcredentials.js">

+      <Link>Resources\dashboard-ui\thirdparty\cordova\android\androidcredentials.js</Link>

+    </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\cordova\android\appstorage.js">

+      <Link>Resources\dashboard-ui\thirdparty\cordova\android\appstorage.js</Link>

+    </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\cordova\android\filesystem.js">

+      <Link>Resources\dashboard-ui\thirdparty\cordova\android\filesystem.js</Link>

+    </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\cordova\android\iap.js">

+      <Link>Resources\dashboard-ui\thirdparty\cordova\android\iap.js</Link>

+    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\cordova\android\immersive.js">

       <Link>Resources\dashboard-ui\thirdparty\cordova\android\immersive.js</Link>

     </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\cordova\android\localassetmanager.js">

+      <Link>Resources\dashboard-ui\thirdparty\cordova\android\localassetmanager.js</Link>

+    </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\cordova\android\mediasession.js">

+      <Link>Resources\dashboard-ui\thirdparty\cordova\android\mediasession.js</Link>

+    </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\cordova\android\nativedirectorychooser.js">

+      <Link>Resources\dashboard-ui\thirdparty\cordova\android\nativedirectorychooser.js</Link>

+    </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\cordova\android\vlcplayer.js">

+      <Link>Resources\dashboard-ui\thirdparty\cordova\android\vlcplayer.js</Link>

+    </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\cordova\ios\orientation.js">

+      <Link>Resources\dashboard-ui\thirdparty\cordova\ios\orientation.js</Link>

+    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\fontawesome\css\font-awesome.css">

       <Link>Resources\dashboard-ui\thirdparty\fontawesome\css\font-awesome.css</Link>

     </BundleResource>

@@ -2338,9 +2350,6 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\jquerymobile-1.4.5\images\icons-svg\video-white.svg">

       <Link>Resources\dashboard-ui\thirdparty\jquerymobile-1.4.5\images\icons-svg\video-white.svg</Link>

     </BundleResource>

-    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\jstree3.0.8\jstree.js">

-      <Link>Resources\dashboard-ui\thirdparty\jstree3.0.8\jstree.js</Link>

-    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\jstree3.0.8\jstree.min.js">

       <Link>Resources\dashboard-ui\thirdparty\jstree3.0.8\jstree.min.js</Link>

     </BundleResource>

@@ -2359,23 +2368,38 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\jstree3.0.8\themes\default\throbber.gif">

       <Link>Resources\dashboard-ui\thirdparty\jstree3.0.8\themes\default\throbber.gif</Link>

     </BundleResource>

-    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\jstree3.0.8\themes\default-dark\32px.png">

-      <Link>Resources\dashboard-ui\thirdparty\jstree3.0.8\themes\default-dark\32px.png</Link>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\materialicons\MaterialIcons-Regular.eot">

+      <Link>Resources\dashboard-ui\thirdparty\materialicons\MaterialIcons-Regular.eot</Link>

+    </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\materialicons\MaterialIcons-Regular.ttf">

+      <Link>Resources\dashboard-ui\thirdparty\materialicons\MaterialIcons-Regular.ttf</Link>

+    </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\materialicons\MaterialIcons-Regular.woff">

+      <Link>Resources\dashboard-ui\thirdparty\materialicons\MaterialIcons-Regular.woff</Link>

     </BundleResource>

-    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\jstree3.0.8\themes\default-dark\40px.png">

-      <Link>Resources\dashboard-ui\thirdparty\jstree3.0.8\themes\default-dark\40px.png</Link>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\materialicons\MaterialIcons-Regular.woff2">

+      <Link>Resources\dashboard-ui\thirdparty\materialicons\MaterialIcons-Regular.woff2</Link>

     </BundleResource>

-    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\jstree3.0.8\themes\default-dark\style.css">

-      <Link>Resources\dashboard-ui\thirdparty\jstree3.0.8\themes\default-dark\style.css</Link>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\materialicons\codepoints.txt">

+      <Link>Resources\dashboard-ui\thirdparty\materialicons\codepoints.txt</Link>

     </BundleResource>

-    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\jstree3.0.8\themes\default-dark\style.min.css">

-      <Link>Resources\dashboard-ui\thirdparty\jstree3.0.8\themes\default-dark\style.min.css</Link>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\materialicons\style.css">

+      <Link>Resources\dashboard-ui\thirdparty\materialicons\style.css</Link>

     </BundleResource>

-    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\jstree3.0.8\themes\default-dark\throbber.gif">

-      <Link>Resources\dashboard-ui\thirdparty\jstree3.0.8\themes\default-dark\throbber.gif</Link>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\polymer\LICENSE.txt">

+      <Link>Resources\dashboard-ui\thirdparty\polymer\LICENSE.txt</Link>

     </BundleResource>

-    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\swipebox-master\css\swipebox.css">

-      <Link>Resources\dashboard-ui\thirdparty\swipebox-master\css\swipebox.css</Link>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\polymer\bower.json">

+      <Link>Resources\dashboard-ui\thirdparty\polymer\bower.json</Link>

+    </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\polymer\polymer-micro.html">

+      <Link>Resources\dashboard-ui\thirdparty\polymer\polymer-micro.html</Link>

+    </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\polymer\polymer-mini.html">

+      <Link>Resources\dashboard-ui\thirdparty\polymer\polymer-mini.html</Link>

+    </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\polymer\polymer.html">

+      <Link>Resources\dashboard-ui\thirdparty\polymer\polymer.html</Link>

     </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\swipebox-master\css\swipebox.min.css">

       <Link>Resources\dashboard-ui\thirdparty\swipebox-master\css\swipebox.min.css</Link>

@@ -2389,11 +2413,41 @@
     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\swipebox-master\img\loader.gif">

       <Link>Resources\dashboard-ui\thirdparty\swipebox-master\img\loader.gif</Link>

     </BundleResource>

-    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\swipebox-master\js\jquery.swipebox.js">

-      <Link>Resources\dashboard-ui\thirdparty\swipebox-master\js\jquery.swipebox.js</Link>

-    </BundleResource>

     <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\swipebox-master\js\jquery.swipebox.min.js">

       <Link>Resources\dashboard-ui\thirdparty\swipebox-master\js\jquery.swipebox.min.js</Link>

     </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\webcomponentsjs\CustomElements.min.js">

+      <Link>Resources\dashboard-ui\thirdparty\webcomponentsjs\CustomElements.min.js</Link>

+    </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\webcomponentsjs\HTMLImports.min.js">

+      <Link>Resources\dashboard-ui\thirdparty\webcomponentsjs\HTMLImports.min.js</Link>

+    </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\webcomponentsjs\MutationObserver.min.js">

+      <Link>Resources\dashboard-ui\thirdparty\webcomponentsjs\MutationObserver.min.js</Link>

+    </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\webcomponentsjs\README.md">

+      <Link>Resources\dashboard-ui\thirdparty\webcomponentsjs\README.md</Link>

+    </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\webcomponentsjs\ShadowDOM.min.js">

+      <Link>Resources\dashboard-ui\thirdparty\webcomponentsjs\ShadowDOM.min.js</Link>

+    </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\webcomponentsjs\bower.json">

+      <Link>Resources\dashboard-ui\thirdparty\webcomponentsjs\bower.json</Link>

+    </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\webcomponentsjs\package.json">

+      <Link>Resources\dashboard-ui\thirdparty\webcomponentsjs\package.json</Link>

+    </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\webcomponentsjs\webcomponents-lite.min.js">

+      <Link>Resources\dashboard-ui\thirdparty\webcomponentsjs\webcomponents-lite.min.js</Link>

+    </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\thirdparty\webcomponentsjs\webcomponents.min.js">

+      <Link>Resources\dashboard-ui\thirdparty\webcomponentsjs\webcomponents.min.js</Link>

+    </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\voice\voice.css">

+      <Link>Resources\dashboard-ui\voice\voice.css</Link>

+    </BundleResource>

+    <BundleResource Include="..\MediaBrowser.WebDashboard\dashboard-ui\voice\voice.js">

+      <Link>Resources\dashboard-ui\voice\voice.js</Link>

+    </BundleResource>

   </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/MediaBrowser.Server.Mac/Native/BaseMonoApp.cs b/MediaBrowser.Server.Mac/Native/BaseMonoApp.cs
index 57610dfc2..da4675b5e 100644
--- a/MediaBrowser.Server.Mac/Native/BaseMonoApp.cs
+++ b/MediaBrowser.Server.Mac/Native/BaseMonoApp.cs
@@ -19,7 +19,7 @@ namespace MediaBrowser.Server.Mac
         /// <summary>
         /// Restarts this instance.
         /// </summary>
-        public virtual void Restart()
+		public virtual void Restart(StartupOptions options)
         {
             throw new NotImplementedException();
         }
diff --git a/MediaBrowser.Server.Mac/Native/NativeApp.cs b/MediaBrowser.Server.Mac/Native/NativeApp.cs
index 4515be051..005fb0914 100644
--- a/MediaBrowser.Server.Mac/Native/NativeApp.cs
+++ b/MediaBrowser.Server.Mac/Native/NativeApp.cs
@@ -1,4 +1,5 @@
 using System;
+using MediaBrowser.Server.Startup.Common;
 
 namespace MediaBrowser.Server.Mac
 {
@@ -30,7 +31,7 @@ namespace MediaBrowser.Server.Mac
         /// <summary>
         /// Restarts this instance.
         /// </summary>
-        public override void Restart()
+		public override void Restart(StartupOptions options)
         {
             MainClass.Restart();
         }