Merge branch '6.1.2' into 7.0.0

Conflicts:
	.gitignore
	src/Umbraco.Web/Mvc/BackOfficeArea.cs
	src/Umbraco.Web/WebBootManager.cs

src/Umbraco.Web.UI/umbraco/config/lang/en.xml

@@ -639,6 +639,7 @@ To manage your website, simply open the umbraco back office and start adding con
     <key alias="packageUpgradeInstructions">Upgrade instructions</key>
     <key alias="packageUpgradeText"> There's an upgrade available for this package. You can download it directly from the umbraco package repository.</key>
     <key alias="packageVersion">Package version</key>
+    <key alias="packageVersionHistory">Package version history</key>
     <key alias="viewPackageWebsite">View package website</key>
   </area>
   <area alias="paste">

src/Umbraco.Web.UI/umbraco/developer/Packages/installedPackage.aspx

@@ -56,7 +56,17 @@
       
     
     </cc2:Pane>
-    
+
+    <cc2:Pane ID="pane_versions" runat="server" Text="Package version history" Visible="false">
+        <cc2:PropertyPanel ID="pp_versions" runat="server">
+            <asp:Repeater ID="rptr_versions" runat="server">
+                <HeaderTemplate><ul></HeaderTemplate>
+                <ItemTemplate><li><a href="installedPackage.aspx?id=<%# ((umbraco.cms.businesslogic.packager.InstalledPackage)Container.DataItem).Data.Id %>"><%# ((umbraco.cms.businesslogic.packager.InstalledPackage)Container.DataItem).Data.Version %></a></li></ItemTemplate>
+                <FooterTemplate></ul></FooterTemplate>
+            </asp:Repeater>
+        </cc2:PropertyPanel>
+    </cc2:Pane>
+
     <cc2:Pane ID="pane_options" runat="server" Text="Package options">
         <table border="0" style="width: 100%;">
         <tr><td class="propertyHeader" valign="top">

src/Umbraco.Web.UI/umbraco/settings/stylesheet/editstylesheet.aspx

@@ -25,10 +25,11 @@
                     }
                 });
                 editor.init();
-            });
                 
                 //bind save shortcut
                 UmbClientMgr.appActions().bindSaveShortCut();
+            });
+                
             })(jQuery);
 
     </script>

src/Umbraco.Web.UI/umbraco_client/FolderBrowser/Js/folderbrowser.js

@@ -178,7 +178,7 @@ Umbraco.Sys.registerNamespace("Umbraco.Controls");
             var overlay = $("<div class='upload-overlay'>" +
                 "<div class='upload-panel'>" +
                 instructions +
-                "<form action=\"/umbraco/webservices/MediaUploader.ashx?format=json&action=upload&parentNodeId=" + this._parentId + "\" method=\"post\" enctype=\"multipart/form-data\">" +
+                "<form action=\"" + self._opts.umbracoPath + "/webservices/MediaUploader.ashx?format=json&action=upload&parentNodeId=" + this._parentId + "\" method=\"post\" enctype=\"multipart/form-data\">" +
                 "<input id='fileupload' type='file' name='file' multiple>" +
                 "<input type='hidden' name='name' />" +
                 "<input type='hidden' name='replaceExisting' />" +

src/Umbraco.Web.UI/web.Template.config

@@ -167,13 +167,6 @@
         <add name="UmbracoRoleProvider" type="umbraco.providers.members.UmbracoRoleProvider" />
       </providers>
     </roleManager>
-    <!-- Sitemap provider-->
-    <siteMap defaultProvider="UmbracoSiteMapProvider" enabled="true">
-      <providers>
-        <clear />
-        <add name="UmbracoSiteMapProvider" type="umbraco.presentation.nodeFactory.UmbracoSiteMapProvider" defaultDescriptionAlias="description" securityTrimmingEnabled="true" />
-      </providers>
-    </siteMap>
   </system.web>
 
   <!-- ASPNETAJAX -->
@@ -290,4 +283,4 @@
     </pages>
   </system.web.webPages.razor>
 
-</configuration>
+</configuration>