Merge branch '2.3'

Conflicts:
	resources/qml/MonitorButton.qml

resources/qml/Cura.qml

@@ -346,6 +346,7 @@ UM.MainWindow
                     bottom: parent.bottom;
                     right: parent.right;
                 }
+                z: 1
                 onMonitoringPrintChanged: base.monitoringPrint = monitoringPrint
                 width: UM.Theme.getSize("sidebar").width;
             }

resources/qml/MonitorButton.qml

@@ -4,7 +4,6 @@
 import QtQuick 2.2
 import QtQuick.Controls 1.1
 import QtQuick.Controls.Styles 1.1
-import QtQuick.Dialogs 1.1
 import QtQuick.Layouts 1.1
 
 import UM 1.1 as UM
@@ -161,7 +160,7 @@ Rectangle
         anchors.rightMargin: UM.Theme.getSize("default_margin").width
 
         text: catalog.i18nc("@label:", "Abort Print")
-        onClicked: confirmationDialog.visible = true
+        onClicked: Cura.MachineManager.printerOutputDevices[0].setJobState("abort")
 
         style: ButtonStyle
         {
@@ -221,9 +220,9 @@ Rectangle
     {
         id: confirmationDialog
 
-        title: catalog.i18nc("@text:MessageDialog", "Abort print")
+        title: catalog.i18nc("@window:title", "Abort print")
         icon: StandardIcon.Warning
-        text: catalog.i18nc("@text:MessageDialog", "Do you really want to abort the print?")
+        text: catalog.i18nc("@label", "Are you sure you want to abort the print?")
         standardButtons: StandardButton.Yes | StandardButton.No
         Component.onCompleted: visible = false
         onYes: Cura.MachineManager.printerOutputDevices[0].setJobState("abort")

resources/qml/SidebarHeader.qml

@@ -277,7 +277,7 @@ Column
             height: UM.Theme.getSize("setting_control").height
             tooltip: Cura.MachineManager.activeQualityName
             style: UM.Theme.styles.sidebar_header_button
-
+            property var valueWarning: Cura.MachineManager.activeQualityId == "empty_quality"
             menu: ProfileMenu { }
 
             UM.SimpleButton