Merge tag '14.12' into upstream

Conflicts:
	Cura/gui/app.py
	Cura/gui/configWizard.py
	Cura/gui/firmwareInstall.py
	Cura/util/bigDataStorage.py
	Cura/util/profile.py
	package.sh

diff --cc Cura/gui/printWindow.py
index eb2eb250b0c06e3b126141ce719d97a34c4b349e,5f3cb0637c904e215bf136446338ddca21c258c5..6356df6491486bdc8cb380da8fbf6dd4f347dd80
--- 1/Cura/gui/printWindow.py
--- 2/Cura/gui/printWindow.py
+++ b/Cura/gui/printWindow.py
@@@ -497,11 -443,7 +497,14 @@@ class printWindowBasic(wx.Frame)
                        info += ' Bed: %d' % (self._printerConnection.getBedTemperature())
                info += '\n\n'
                self.statsText.SetLabel(info)
 +              if connection.isPrinting() != self._isPrinting:
 +                      self._isPrinting = connection.isPrinting()
 +                      preventComputerFromSleeping(self._isPrinting)
 +
 +
++      def _addTermLog(self, msg):
++              pass
+ 
        def _addTermLog(self, msg):
                pass