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

MediaBrowser.WebDashboard/Api/DashboardService.cs

@@ -394,7 +394,7 @@ namespace MediaBrowser.WebDashboard.Api
             var files = new[]
                             {
                                 "http://code.jquery.com/mobile/1.3.0/jquery.mobile-1.3.0.min.css",
-                                "http://vjs.zencdn.net/c/video-js.css",
+                                "thirdparty/video-js/video-js.min.css",
                                 "thirdparty/jqm-icon-pack-3.0/font-awesome/jqm-icon-pack-3.0.0-fa.css",
                                 "css/all.css" + versionString
                             };
@@ -417,7 +417,7 @@ namespace MediaBrowser.WebDashboard.Api
                             {
                                 "http://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js", 
                                 "http://code.jquery.com/mobile/1.3.0/jquery.mobile-1.3.0.min.js",
-                                "http://vjs.zencdn.net/c/video.js",
+                                "thirdparty/video-js/video.min.js",
                                 "scripts/all.js" + versionString
             };