Merge remote-tracking branch 'origin/v8/dev' into v8/bugfix/AB3323-SqlMainDom

src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs

@@ -185,8 +185,8 @@ namespace Umbraco.Core.Migrations.Upgrade
 
             // to 8.6.0
             To<AddPropertyTypeValidationMessageColumns>("{3D67D2C8-5E65-47D0-A9E1-DC2EE0779D6B}");
-            To<AddMainDomLock>("{2AB29964-02A1-474D-BD6B-72148D2A53A2}");
             To<MissingContentVersionsIndexes>("{EE288A91-531B-4995-8179-1D62D9AA3E2E}");
+            To<AddMainDomLock>("{2AB29964-02A1-474D-BD6B-72148D2A53A2}");
 
             //FINAL
         }

src/Umbraco.Web.UI.Client/src/common/services/tour.service.js

@@ -162,18 +162,19 @@
                                 newGroup.groupOrder = item.groupOrder;
                             }
 
-                        if(item.hidden === false){
-                            newGroup.tours.push(item);
-                            groupedTours.push(newGroup);
+                            if(item.hidden === false){
+                                newGroup.tours.push(item);
+                                groupedTours.push(newGroup);
+                            }
                         }
                     }
 
-                }
+                });
 
                 deferred.resolve(groupedTours);
             });
             return deferred.promise;
-        });
+        }
 
         /**
          * @ngdoc method