Merge remote-tracking branch 'origin/7.0.0-pubcontent' into 7.0.0

src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx

@@ -13,7 +13,6 @@
             <asp:ListItem Value="clean.xslt">Clean</asp:ListItem>
         </asp:ListBox>
     </cc1:PropertyPanel>
-
 </cc1:Pane>
 
 <!-- added to support missing postback on enter in IE -->

src/Umbraco.Web.UI/packages.config

@@ -16,7 +16,7 @@
   <package id="Microsoft.AspNet.WebPages" version="2.0.30506.0" targetFramework="net40" />
   <package id="Microsoft.Bcl" version="1.1.3" targetFramework="net45" />
   <package id="Microsoft.Bcl.Build" version="1.0.10" targetFramework="net45" />
-  <package id="Microsoft.Net.Http" version="2.2.15" targetFramework="net45" />
+  <package id="Microsoft.Net.Http" version="2.2.15" targetFramework="net45" requireReinstallation="True" />
   <package id="Microsoft.Web.Helpers" version="1.0.0" targetFramework="net40" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
   <package id="MiniProfiler" version="2.1.0" targetFramework="net40" />
@@ -26,4 +26,4 @@
   <package id="SqlServerCE" version="4.0.0.0" targetFramework="net40" />
   <package id="uGoLive" version="1.4.0" targetFramework="net40" />
   <package id="UrlRewritingNet.UrlRewriter" version="2.0.60829.1" targetFramework="net40" />
-</packages>
+</packages>

src/Umbraco.Web.UI/umbraco/config/create/UI.xml

@@ -334,8 +334,8 @@
     <header>Macro</header>
     <usercontrol>/Create/PartialViewMacro.ascx</usercontrol>
     <tasks>
-			<create assembly="umbraco" type="PartialViewMacroTasks" />
-			<delete assembly="umbraco" type="PartialViewMacroTasks" />
+      <create assembly="umbraco" type="PartialViewMacroTasks" />
+      <delete assembly="umbraco" type="PartialViewMacroTasks" />
     </tasks>
   </nodeType>
   <nodeType alias="forms">
@@ -362,4 +362,4 @@
       <delete assembly="Umbraco.Forms.UI" type="Tasks.PrevalueSourceTasks" />
     </tasks>
   </nodeType>
-</createUI>
+</createUI>