Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Conflicts: MediaBrowser.WebDashboard/dashboard-ui/edititemmetadata.htmlpull/702/head
commit
2653b7db49
Conflicts: MediaBrowser.WebDashboard/dashboard-ui/edititemmetadata.htmlpull/702/head