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

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

MediaBrowser.Common.Implementations/Archiving/ZipClient.cs

@@ -63,7 +63,7 @@ namespace MediaBrowser.Common.Implementations.Archiving
                 reader.WriteAllToDirectory(targetPath, options);
             }
         }
-        
+
         /// <summary>
         /// Extracts all from7z.
         /// </summary>

MediaBrowser.Model/IO/IZipClient.cs

@@ -30,7 +30,7 @@ namespace MediaBrowser.Model.IO
         /// <param name="targetPath">The target path.</param>
         /// <param name="overwriteExistingFiles">if set to <c>true</c> [overwrite existing files].</param>
         void ExtractAllFromZip(Stream source, string targetPath, bool overwriteExistingFiles);
-        
+
         /// <summary>
         /// Extracts all from7z.
         /// </summary>