Merge branch '15.10' of https://github.com/Ultimaker/Cura into 15.10

cura/CuraApplication.py

@@ -434,7 +434,7 @@ class CuraApplication(QtApplication):
         # Reset the position of each node
         for node in group_node.getChildren():
             new_position = node.getMeshData().getCenterPosition()
-            new_position.setY(0)
+            #new_position.setY(0)
             node.setPosition(new_position)
         
         # Use the previously found center of the group bounding box as the new location of the group

cura/PlatformPhysics.py

@@ -68,8 +68,9 @@ class PlatformPhysics:
 
             # Move it downwards if bottom is above platform
             move_vector = Vector()
-            if bbox.bottom > 0:
-                move_vector.setY(-bbox.bottom)
+            if not (node.getParent() and node.getParent().callDecoration("isGroup")): #If an object is grouped, don't move it down
+                if bbox.bottom > 0:
+                    move_vector.setY(-bbox.bottom)
             #if not Float.fuzzyCompare(bbox.bottom, 0.0):
             #   pass#move_vector.setY(-bbox.bottom)
 

plugins/ChangeLogPlugin/ChangeLog.qml

@@ -14,9 +14,11 @@ UM.Dialog
     width: 300 * Screen.devicePixelRatio;
     height: 500 * Screen.devicePixelRatio;
     title: "Changelog"
+
     ScrollView
     {
-        anchors.fill:parent
+        width: parent.width
+        height: parent.height - 25
         Text
         {
             text: manager.getChangeLogString()
@@ -24,4 +26,11 @@ UM.Dialog
             wrapMode: Text.Wrap;
         }
     }
+    Button
+    {
+        anchors.bottom:parent.bottom
+        text: "close"
+        onClicked: base.hide()
+        anchors.horizontalCenter: parent.horizontalCenter
+    }
 }

resources/machines/fdmprinter.json

@@ -1231,7 +1231,7 @@
                         "concentric": "Concentric",
                         "zigzag": "Zig Zag"
                     },
-                    "default": "Concentric"
+                    "default": "concentric"
                 },
                 "support_use_towers": {
                     "label": "Use towers.",

resources/qml/WizardPages/AddMachine.qml

@@ -24,6 +24,12 @@ Item
         target: base.wizard
         onNextClicked: //You can add functions here that get triggered when the final button is clicked in the wizard-element
         {
+            var old_page_count = base.wizard.getPageCount()
+            // Delete old pages (if any)
+            for (var i = old_page_count - 1; i > 0; i--)
+            {
+                base.wizard.removePage(i)
+            }
             saveMachine()
         }
         onBackClicked: