Merge pull request #1346 from MediaBrowser/master

merge from master

dashboard-ui/scripts/site.js

@@ -1771,7 +1771,6 @@ var AppInfo = {};
         var urlArgs = "v=" + (window.dashboardVersion || new Date().getDate());
 
         var bowerPath = "bower_components";
-        var apiClientBowerPath = "bower_components/emby-apiclient";
 
         // Put the version into the bower path since we can't easily put a query string param on html imports
         // Emby server will handle this
@@ -1779,6 +1778,8 @@ var AppInfo = {};
             bowerPath += window.dashboardVersion;
         }
 
+        var apiClientBowerPath = bowerPath + "/emby-apiclient";
+
         var paths = {
             velocity: bowerPath + "/velocity/velocity.min",
             tvguide: 'components/tvguide/tvguide',

dashboard-ui/themes/holiday/theme.js

@@ -40,7 +40,7 @@
         if (lastSound == 0) {
             playSound('https://github.com/MediaBrowser/Emby.Resources/raw/master/themes/holiday/christmas.wav', .1);
         } else if ((new Date().getTime() - lastSound) > 30000) {
-            playSound('https://github.com/MediaBrowser/Emby.Resources/raw/master/themes/holiday/sleighbells.wav');
+            playSound('https://github.com/MediaBrowser/Emby.Resources/raw/master/themes/holiday/sleighbells.wav', .25);
         }
     }