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

Conflicts:
	MediaBrowser.Common.Implementations/Archiving/ZipClient.cs
	MediaBrowser.Model/IO/IZipClient.cs

dashboard-ui/scripts/librarybrowser.js

@@ -401,7 +401,7 @@
             }
 
             if (commands.indexOf('refresh') != -1) {
-                html += '<li><a class="btnMoreMenuRefresh" href="#" onclick="$(\'.playFlyout\').popup(\'close\');LibraryBrowser.refreshItem([\'' + itemId + '\']);">' + Globalize.translate('ButtonRefresh') + '</a></li>';
+                html += '<li><a class="btnMoreMenuRefresh" href="#">' + Globalize.translate('ButtonRefresh') + '</a></li>';
             }
 
             if (commands.indexOf('delete') != -1) {
@@ -422,6 +422,8 @@
 
             $('.btnMoreMenuRefresh', elem).on('click', function () {
 
+                $('.playFlyout').popup('close');
+
                 ApiClient.refreshItem(itemId, {
 
                     Recursive: true,