Merge branch temp8 into temp8-fixtree

src/Umbraco.Web/Trees/FilesTreeController.cs

@@ -15,11 +15,5 @@ namespace Umbraco.Web.Trees
         protected override string[] Extensions => ExtensionsStatic;
 
         protected override string FileIcon => "icon-document";
-
-        protected override void OnRenderFolderNode(ref TreeNode treeNode)
-        {
-            //TODO: This isn't the best way to ensure a noop process for clicking a node but it works for now.
-            treeNode.AdditionalData["jsClickCallback"] = "javascript:void(0);";
-        }
     }
 }