Merge branch 'master' into SteamEngine

Conflicts:
	Cura/gui/mainWindow.py
	Cura/slice/__main__.py
	Cura/util/profile.py

diff --cc Cura/gui/mainWindow.py
index a9b79f679005b02d4c3b11dfc9dbdb3d714aee23,1c143f619ffebcf801a874abc89000ff866c5fbf..5ec23fe5e689ef0b5265a2c011950e67fd31f854
--- 1/Cura/gui/mainWindow.py
--- 2/Cura/gui/mainWindow.py
+++ b/Cura/gui/mainWindow.py
@@@ -252,10 -265,8 +253,9 @@@ class mainWindow(wx.Frame)
                        self.splitter.SetSashSize(0)
                else:
                        self.splitter.SetSashPosition(self.normalSashPos, True)
- 
                        # Enabled sash
                        self.splitter.SetSashSize(4)
 +              self.scene.updateProfileToControls()
                                                                
        def OnPreferences(self, e):
                prefDialog = preferencesDialog.preferencesDialog(self)
@@@ -479,20 -678,10 +479,24 @@@ class normalSettingsPanel(configBase.co
  
                self.Bind(wx.EVT_SIZE, self.OnSize)
  
+               self.nb.SetSize(self.GetSize())
+               self.UpdateSize(self.printPanel)
+               self.UpdateSize(self.advancedPanel)
+ 
 +      def _addSettingsToPanels(self, category, left, right):
 +              count = len(profile.getSubCategoriesFor(category)) + len(profile.getSettingsForCategory(category))
 +
 +              p = left
 +              n = 0
 +              for title in profile.getSubCategoriesFor(category):
 +                      n += 1 + len(profile.getSettingsForCategory(category, title))
 +                      if n > count / 2:
 +                              p = right
 +                      configBase.TitleRow(p, title)
 +                      for s in profile.getSettingsForCategory(category, title):
 +                              if s.checkConditions():
 +                                      configBase.SettingRow(p, s.getName())
 +
        def SizeLabelWidths(self, left, right):
                leftWidth = self.getLabelColumnWidth(left)
                rightWidth = self.getLabelColumnWidth(right)