Merge remote-tracking branch 'origin/master' into backbone

NzbDrone.Core/Providers/DiskScanProvider.cs

@@ -198,7 +198,15 @@ namespace NzbDrone.Core.Providers
             Logger.Debug("Moving [{0}] > [{1}]", episodeFile.Path, newFile.FullName);
             _diskProvider.MoveFile(episodeFile.Path, newFile.FullName);
 
+            //Wrapped in Try/Catch to prevent this from causing issues with remote NAS boxes, the move worked, which is more important.
+            try
+            {
                 _diskProvider.InheritFolderPermissions(newFile.FullName);
+            }
+            catch (UnauthorizedAccessException ex)
+            {
+                Logger.Debug("Unable to apply folder permissions to: ", newFile.FullName);
+            }
 
             episodeFile.Path = newFile.FullName;
             _mediaFileProvider.Update(episodeFile);

NzbDrone.Web/Views/Settings/DownloadClient.cshtml

@@ -62,7 +62,8 @@
 <div id="result" class="hiddenResult">
 </div>
 
-<script type="text/javascript">
+@section Scripts{
+    <script type="text/javascript">
         $(document).ready(function () {
             $('#downloadClientAccordion').accordion("activate", false);
 
@@ -156,4 +157,5 @@
                 }
             });
         });
-</script>
+    </script>
+}