Merge branch 'netcore/dev' into netcore/feature/untangle-membership

# Conflicts:
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs

src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Gallery.cshtml

@@ -31,13 +31,13 @@
             @* a single image *@
             if (media.IsDocumentType("Image"))
             {
-                @Render(media);
+                @Render(media)
             }
 
             @* a folder with images under it *@
             foreach (var image in media.Children(Current.VariationContextAccessor))
             {
-                @Render(image);
+                @Render(image)
             }
         }
     </div>

src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap3-Fluid.cshtml

@@ -2,31 +2,31 @@
 @using Umbraco.Web.Templates
 @using Newtonsoft.Json.Linq
 
-@* 
+@*
     Razor helpers located at the bottom of this file
 *@
 
 @if (Model != null && Model.sections != null)
 {
     var oneColumn = ((System.Collections.ICollection)Model.sections).Count == 1;
-    
+
     <div class="umb-grid">
         @if (oneColumn)
         {
             foreach (var section in Model.sections) {
                 <div class="grid-section">
                     @foreach (var row in section.rows) {
-                        @renderRow(row);
+                        @renderRow(row)
                     }
                 </div>
-            }   
-        }else { 
+            }
+        }else {
             <div class="row clearfix">
                 @foreach (var s in Model.sections) {
                     <div class="grid-section">
                         <div class="col-md-@s.grid column">
                             @foreach (var row in s.rows) {
-                                @renderRow(row);
+                                @renderRow(row)
                             }
                         </div>
                     </div>
@@ -85,4 +85,4 @@
 
         return new MvcHtmlString(string.Join(" ", attrs));
     }
-}
+}

src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap3.cshtml

@@ -12,7 +12,7 @@
             foreach (var section in Model.sections) {
                 <div class="grid-section">
                     @foreach (var row in section.rows) {
-                        @renderRow(row, true);
+                        @renderRow(row, true)
                     }
                 </div>
             }
@@ -23,7 +23,7 @@
                         <div class="grid-section">
                             <div class="col-md-@s.grid column">
                                 @foreach (var row in s.rows) {
-                                    @renderRow(row, false);
+                                    @renderRow(row, false)
                                 }
                             </div>
                         </div>