merged

diff --cc Cura/gui/mainWindow.py
index 97ea62dcc238f300c04c893e17b7229c903b1851,2f1dfa9f2422f3ae4806530b4bdc4245b8740dda..f6260a947af1f4938416c4696cb31caa1a2ebd8a
--- 1/Cura/gui/mainWindow.py
--- 2/Cura/gui/mainWindow.py
+++ b/Cura/gui/mainWindow.py
@@@ -306,8 -268,8 +306,8 @@@ class mainWindow(wx.Frame)
        def OnDropFiles(self, files):
                if len(files) > 0:
                        profile.setPluginConfig([])
 -                      self.updateProfileToControls()
 +                      self.updateProfileToAllControls()
-               self.scene.loadScene(files)
+               self.scene.loadFiles(files)
  
        def OnModelMRU(self, e):
                fileNum = e.GetId() - self.ID_MRU_MODEL1