diff --git a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
index 6cc96490e8..4e6bfaa43b 100644
--- a/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
+++ b/MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
@@ -79,7 +79,7 @@
False
- ..\packages\CommonIO.1.0.0.5\lib\net45\CommonIO.dll
+ ..\packages\CommonIO.1.0.0.7\lib\net45\CommonIO.dll
..\packages\Patterns.Logging.1.0.0.2\lib\portable-net45+sl4+wp71+win8+wpa81\Patterns.Logging.dll
@@ -506,6 +506,9 @@
Resources\dashboard-ui\selectserver.html
+
+ Resources\dashboard-ui\serversecurity.html
+
Resources\dashboard-ui\shared.html
@@ -1136,6 +1139,18 @@
Resources\dashboard-ui\bower_components\emby-webcomponents\requirehtml.js
+
+ Resources\dashboard-ui\bower_components\emby-webcomponents\visibleinviewport.js
+
+
+ Resources\dashboard-ui\bower_components\emby-webcomponents\images\basicimagefetcher.js
+
+
+ Resources\dashboard-ui\bower_components\emby-webcomponents\images\imagehelper.js
+
+
+ Resources\dashboard-ui\bower_components\emby-webcomponents\images\persistentimagefetcher.js
+
Resources\dashboard-ui\bower_components\fastclick\.bower.json
@@ -1298,6 +1313,9 @@
Resources\dashboard-ui\bower_components\hls.js\src\errors.js
+
+ Resources\dashboard-ui\bower_components\hls.js\src\event-handler.js
+
Resources\dashboard-ui\bower_components\hls.js\src\events.js
@@ -1328,6 +1346,9 @@
Resources\dashboard-ui\bower_components\hls.js\src\demux\aacdemuxer.js
+
+ Resources\dashboard-ui\bower_components\hls.js\src\demux\adts.js
+
Resources\dashboard-ui\bower_components\hls.js\src\demux\demuxer-inline.js
@@ -1367,6 +1388,9 @@
Resources\dashboard-ui\bower_components\hls.js\src\remux\mp4-remuxer.js
+
+ Resources\dashboard-ui\bower_components\hls.js\src\utils\attr-list.js
+
Resources\dashboard-ui\bower_components\hls.js\src\utils\binary-search.js
@@ -2363,11 +2387,50 @@
Resources\dashboard-ui\bower_components\jquery\.bower.json
-
- Resources\dashboard-ui\bower_components\jquery\MIT-LICENSE.txt
+
+ Resources\dashboard-ui\bower_components\jquery\.editorconfig
+
+
+ Resources\dashboard-ui\bower_components\jquery\.gitattributes
+
+
+ Resources\dashboard-ui\bower_components\jquery\.gitignore
+
+
+ Resources\dashboard-ui\bower_components\jquery\.jscsrc
-
- Resources\dashboard-ui\bower_components\jquery\bower.json
+
+ Resources\dashboard-ui\bower_components\jquery\.jshintignore
+
+
+ Resources\dashboard-ui\bower_components\jquery\.jshintrc
+
+
+ Resources\dashboard-ui\bower_components\jquery\.mailmap
+
+
+ Resources\dashboard-ui\bower_components\jquery\.npmignore
+
+
+ Resources\dashboard-ui\bower_components\jquery\.travis.yml
+
+
+ Resources\dashboard-ui\bower_components\jquery\AUTHORS.txt
+
+
+ Resources\dashboard-ui\bower_components\jquery\CONTRIBUTING.md
+
+
+ Resources\dashboard-ui\bower_components\jquery\Gruntfile.js
+
+
+ Resources\dashboard-ui\bower_components\jquery\LICENSE.txt
+
+
+ Resources\dashboard-ui\bower_components\jquery\README.md
+
+
+ Resources\dashboard-ui\bower_components\jquery\package.json
Resources\dashboard-ui\bower_components\jquery\dist\jquery.js
@@ -2378,6 +2441,48 @@
Resources\dashboard-ui\bower_components\jquery\dist\jquery.min.map
+
+ Resources\dashboard-ui\bower_components\jquery\external\npo\npo.js
+
+
+ Resources\dashboard-ui\bower_components\jquery\external\qunit\LICENSE.txt
+
+
+ Resources\dashboard-ui\bower_components\jquery\external\qunit\MIT-LICENSE.txt
+
+
+ Resources\dashboard-ui\bower_components\jquery\external\qunit\qunit.css
+
+
+ Resources\dashboard-ui\bower_components\jquery\external\qunit\qunit.js
+
+
+ Resources\dashboard-ui\bower_components\jquery\external\qunit-assert-step\MIT-LICENSE.txt
+
+
+ Resources\dashboard-ui\bower_components\jquery\external\qunit-assert-step\qunit-assert-step.js
+
+
+ Resources\dashboard-ui\bower_components\jquery\external\requirejs\require.js
+
+
+ Resources\dashboard-ui\bower_components\jquery\external\sinon\sinon-1.14.1.js
+
+
+ Resources\dashboard-ui\bower_components\jquery\external\sizzle\LICENSE.txt
+
+
+ Resources\dashboard-ui\bower_components\jquery\external\sizzle\dist\sizzle.js
+
+
+ Resources\dashboard-ui\bower_components\jquery\external\sizzle\dist\sizzle.min.js
+
+
+ Resources\dashboard-ui\bower_components\jquery\external\sizzle\dist\sizzle.min.map
+
+
+ Resources\dashboard-ui\bower_components\jquery\src\.jshintrc
+
Resources\dashboard-ui\bower_components\jquery\src\ajax.js
@@ -2492,9 +2597,15 @@
Resources\dashboard-ui\bower_components\jquery\src\core\ready.js
+
+ Resources\dashboard-ui\bower_components\jquery\src\core\support.js
+
Resources\dashboard-ui\bower_components\jquery\src\css\addGetHookIf.js
+
+ Resources\dashboard-ui\bower_components\jquery\src\css\adjustCSS.js
+
Resources\dashboard-ui\bower_components\jquery\src\css\curCSS.js
@@ -2504,18 +2615,15 @@
Resources\dashboard-ui\bower_components\jquery\src\css\hiddenVisibleSelectors.js
+
+ Resources\dashboard-ui\bower_components\jquery\src\css\showHide.js
+
Resources\dashboard-ui\bower_components\jquery\src\css\support.js
-
- Resources\dashboard-ui\bower_components\jquery\src\css\swap.js
-
Resources\dashboard-ui\bower_components\jquery\src\data\Data.js
-
- Resources\dashboard-ui\bower_components\jquery\src\data\accepts.js
-
Resources\dashboard-ui\bower_components\jquery\src\effects\Tween.js
@@ -2528,9 +2636,15 @@
Resources\dashboard-ui\bower_components\jquery\src\event\alias.js
+
+ Resources\dashboard-ui\bower_components\jquery\src\event\focusin.js
+
Resources\dashboard-ui\bower_components\jquery\src\event\support.js
+
+ Resources\dashboard-ui\bower_components\jquery\src\event\trigger.js
+
Resources\dashboard-ui\bower_components\jquery\src\exports\amd.js
@@ -2540,23 +2654,386 @@
Resources\dashboard-ui\bower_components\jquery\src\manipulation\_evalUrl.js
+
+ Resources\dashboard-ui\bower_components\jquery\src\manipulation\buildFragment.js
+
+
+ Resources\dashboard-ui\bower_components\jquery\src\manipulation\getAll.js
+
+
+ Resources\dashboard-ui\bower_components\jquery\src\manipulation\setGlobalEval.js
+
Resources\dashboard-ui\bower_components\jquery\src\manipulation\support.js
+
+ Resources\dashboard-ui\bower_components\jquery\src\manipulation\wrapMap.js
+
Resources\dashboard-ui\bower_components\jquery\src\queue\delay.js
-
- Resources\dashboard-ui\bower_components\jquery\src\sizzle\dist\sizzle.js
+
+ Resources\dashboard-ui\bower_components\jquery\src\traversing\findFilter.js
-
- Resources\dashboard-ui\bower_components\jquery\src\sizzle\dist\sizzle.min.js
+
+ Resources\dashboard-ui\bower_components\jquery\test\.jshintrc
-
- Resources\dashboard-ui\bower_components\jquery\src\sizzle\dist\sizzle.min.map
+
+ Resources\dashboard-ui\bower_components\jquery\test\delegatetest.html
-
- Resources\dashboard-ui\bower_components\jquery\src\traversing\findFilter.js
+
+ Resources\dashboard-ui\bower_components\jquery\test\hovertest.html
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\index.html
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\jquery.js
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\localfile.html
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\networkerror.html
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\promises_aplus_adapter.js
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\readywait.html
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\xhtml.php
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\1x1.jpg
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\atom+xml.php
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\badcall.js
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\badjson.js
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\cleanScript.html
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\dashboard.xml
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\echoData.php
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\echoQuery.php
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\errorWithJSON.php
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\errorWithText.php
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\etag.php
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\headers.php
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\if_modified_since.php
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\iframe.html
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\jquery-1.9.1.js
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\json.php
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\json_obj.js
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\jsonp.php
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\name.html
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\name.php
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\nocontent.php
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\params_html.php
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\readywaitasset.js
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\readywaitloader.js
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\script.php
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\statusText.php
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\test.html
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\test.php
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\test2.html
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\test3.html
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\testbar.php
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\testinit.js
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\testrunner.js
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\testsuite.css
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\text.php
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\with_fries.xml
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\with_fries_over_jsonp.php
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\ajax\content-type.php
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\ajax\evalScript.php
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\ajax\method.php
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\ajax\onunload.html
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\ajax\unreleasedXHR.html
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\core\aliased.html
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\core\cc_on.html
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\core\dont_return.php
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\core\dynamic_ready.html
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\core\onready.html
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\css\cssWidthBeforeDocReady.html
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\data\dataAttrs.html
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\dimensions\documentLarge.html
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\event\focusElem.html
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\event\focusinCrossFrame.html
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\event\interactiveReady.html
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\event\longLoadScript.php
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\event\onbeforeunload.html
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\event\promiseReady.html
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\event\syncReady.html
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\event\triggerunload.html
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\manipulation\iframe-denied.html
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\offset\absolute.html
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\offset\body.html
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\offset\fixed.html
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\offset\relative.html
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\offset\scroll.html
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\offset\static.html
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\offset\table.html
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\selector\html5_selector.html
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\selector\sizzle_cache.html
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\support\bodyBackground.html
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\support\csp-clean.php
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\support\csp-log.php
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\support\csp.js
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\support\csp.php
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\data\support\getComputedSupport.js
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\integration\gh-1764-fullscreen.html
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\integration\gh-2343-ie-radio-click.html
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\integration\data\gh-1764-fullscreen-iframe.css
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\integration\data\gh-1764-fullscreen-iframe.html
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\integration\data\gh-1764-fullscreen.js
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\node_smoke_tests\.jshintrc
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\node_smoke_tests\document_missing.js
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\node_smoke_tests\document_passed.js
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\node_smoke_tests\document_present_originally.js
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\node_smoke_tests\iterable_with_native_symbol.js
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\node_smoke_tests\iterable_with_symbol_polyfill.js
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\node_smoke_tests\lib\ensure_global_not_created.js
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\node_smoke_tests\lib\ensure_iterability_es6.js
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\node_smoke_tests\lib\ensure_jquery.js
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\unit\ajax.js
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\unit\attributes.js
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\unit\basic.js
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\unit\callbacks.js
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\unit\core.js
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\unit\css.js
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\unit\data.js
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\unit\deferred.js
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\unit\deprecated.js
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\unit\dimensions.js
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\unit\effects.js
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\unit\event.js
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\unit\exports.js
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\unit\manipulation.js
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\unit\offset.js
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\unit\queue.js
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\unit\ready.js
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\unit\selector.js
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\unit\serialize.js
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\unit\support.js
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\unit\traversing.js
+
+
+ Resources\dashboard-ui\bower_components\jquery\test\unit\wrap.js
Resources\dashboard-ui\bower_components\jstree\.bower.json
@@ -2726,6 +3203,9 @@
Resources\dashboard-ui\bower_components\neon-animation\.gitignore
+
+ Resources\dashboard-ui\bower_components\neon-animation\.travis.yml
+
Resources\dashboard-ui\bower_components\neon-animation\CONTRIBUTING.md
@@ -2819,8 +3299,8 @@
Resources\dashboard-ui\bower_components\neon-animation\demo\index.html
-
- Resources\dashboard-ui\bower_components\neon-animation\demo\shared.css
+
+ Resources\dashboard-ui\bower_components\neon-animation\demo\shared-styles.html
Resources\dashboard-ui\bower_components\neon-animation\demo\card\index.html
@@ -2834,8 +3314,8 @@
Resources\dashboard-ui\bower_components\neon-animation\demo\declarative\index.html
-
- Resources\dashboard-ui\bower_components\neon-animation\demo\doc\basic.html
+
+ Resources\dashboard-ui\bower_components\neon-animation\demo\doc\index.html
Resources\dashboard-ui\bower_components\neon-animation\demo\doc\my-animatable.html
@@ -2843,9 +3323,6 @@
Resources\dashboard-ui\bower_components\neon-animation\demo\doc\my-dialog.html
-
- Resources\dashboard-ui\bower_components\neon-animation\demo\doc\types.html
-
Resources\dashboard-ui\bower_components\neon-animation\demo\dropdown\animated-dropdown.html
@@ -4121,9 +4598,6 @@
Resources\dashboard-ui\bower_components\web-animations-js\web-animations.min.js
-
- Resources\dashboard-ui\bower_components\web-animations-js\web-animations.min.js.gz
-
Resources\dashboard-ui\bower_components\web-animations-js\web-animations.min.js.map
@@ -4181,9 +4655,6 @@
Resources\dashboard-ui\components\humanedate.js
-
- Resources\dashboard-ui\components\imagestore.js
-
Resources\dashboard-ui\components\paperdialoghelper.js
@@ -5072,6 +5543,9 @@
Resources\dashboard-ui\scripts\selectserver.js
+
+ Resources\dashboard-ui\scripts\serversecurity.js
+
Resources\dashboard-ui\scripts\shared.js
@@ -5423,9 +5897,6 @@
Resources\dashboard-ui\themes\holiday\theme.js
-
- Resources\dashboard-ui\thirdparty\jquery.unveil-custom.js
-
Resources\dashboard-ui\thirdparty\paper-button-style.css
diff --git a/MediaBrowser.Server.Mac/Main.cs b/MediaBrowser.Server.Mac/Main.cs
index 67effa95fd..b7e158c5d6 100644
--- a/MediaBrowser.Server.Mac/Main.cs
+++ b/MediaBrowser.Server.Mac/Main.cs
@@ -96,7 +96,7 @@ namespace MediaBrowser.Server.Mac
var nativeApp = new NativeApp();
- AppHost = new ApplicationHost(appPaths, logManager, options, fileSystem, "MBServer.Mono", nativeApp);
+ AppHost = new ApplicationHost(appPaths, logManager, options, fileSystem, "Emby.Server.Mac.pkg", nativeApp);
if (options.ContainsOption("-v")) {
Console.WriteLine (AppHost.ApplicationVersion.ToString());
diff --git a/README.md b/README.md
index 6ee0855b74..ead2a2da3f 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ Emby Server
Emby Server is a home media server built on top of other popular open source technologies such as **Service Stack**, **jQuery**, **jQuery mobile**, and **Mono**.
-It features a REST-based api with built-in documention to facilitate client development. We also have client libraries for our api to enable rapid development.
+It features a REST-based API with built-in documention to facilitate client development. We also have client libraries for our API to enable rapid development.
## Emby Apps