Merge branch 'master' into SteamEngine

diff --cc Cura/gui/mainWindow.py
Simple merge

diff --cc Cura/gui/simpleMode.py
index 82cb6bf18e32b2b0943bb932ef3a964fc05b49d3,0b170e77eca7c15e085281e383880888ed6c4366..14d2a891c1b47b67f1d23152372473ff1f1d95cc
--- 1/Cura/gui/simpleMode.py
--- 2/Cura/gui/simpleMode.py
+++ b/Cura/gui/simpleMode.py
@@@ -15,11 -15,10 +15,11 @@@ class simpleModePanel(wx.Panel)
                #self.menubar.Insert(1, toolsMenu, 'Normal mode')
  
                printTypePanel = wx.Panel(self)
-               self.printTypeNormal = wx.RadioButton(printTypePanel, -1, 'Normal quality print', style=wx.RB_GROUP)
+               self.printTypeHigh = wx.RadioButton(printTypePanel, -1, 'High quality print', style=wx.RB_GROUP)
+               self.printTypeNormal = wx.RadioButton(printTypePanel, -1, 'Normal quality print')
                self.printTypeLow = wx.RadioButton(printTypePanel, -1, 'Fast low quality print')
-               self.printTypeHigh = wx.RadioButton(printTypePanel, -1, 'High quality print')
                self.printTypeJoris = wx.RadioButton(printTypePanel, -1, 'Thin walled cup or vase')
 +              self.printTypeJoris.Hide()
  
                printMaterialPanel = wx.Panel(self)
                self.printMaterialPLA = wx.RadioButton(printMaterialPanel, -1, 'PLA', style=wx.RB_GROUP)