Merge branch '15.06' of https://github.com/Ultimaker/Cura into 15.06

Conflicts:
	plugins/LayerView/LayerView.py

plugins/LayerView/LayerView.py

@@ -8,6 +8,8 @@ from UM.Resources import Resources
 from UM.Event import Event, KeyEvent
 from UM.Signal import Signal
 from . import LayerViewProxy
+from UM.Scene.Selection import Selection
+from UM.Math.Color import Color
 
 ## View used to display g-code paths.
 class LayerView(View):
@@ -34,17 +36,20 @@ class LayerView(View):
         scene = self.getController().getScene()
         renderer = self.getRenderer()
         renderer.setRenderSelection(False)
-        
-        ## Recalculate num max layers
-        #self.calculateMaxLayers()
 
         if not self._material:
             self._material = renderer.createMaterial(Resources.getPath(Resources.ShadersLocation, "basic.vert"), Resources.getPath(Resources.ShadersLocation, "vertexcolor.frag"))
             self._material.setUniformValue("u_color", [1.0, 0.0, 0.0, 1.0])
 
+            self._selection_material = renderer.createMaterial(Resources.getPath(Resources.ShadersLocation, "basic.vert"), Resources.getPath(Resources.ShadersLocation, "color.frag"))
+            self._selection_material.setUniformValue("u_color", Color(35, 35, 35, 128))
+
         for node in DepthFirstIterator(scene.getRoot()):
             if not node.render(renderer):
                 if node.getMeshData() and node.isVisible():
+                    if Selection.isSelected(node):
+                        renderer.queueNode(node, material = self._selection_material, transparent = True)
+
                     try:
                         layer_data = node.getMeshData().layerData
                     except AttributeError:

plugins/USBPrinting/PrinterConnection.py

@@ -244,7 +244,10 @@ class PrinterConnection(SignalEmitter):
             self._connect_thread.join()
         if self._serial is not None:
             self.setIsConnected(False)
-            self._listen_thread.join()
+            try:
+                self._listen_thread.join()
+            except:
+                pass
             self._serial.close()
             
         self._serial = None

plugins/USBPrinting/USBPrinterManager.py

@@ -40,7 +40,8 @@ class USBPrinterManager(QObject, SignalEmitter, Extension):
         self._error_message = "" 
         
         ## Add menu item to top menu of the application.
-        self.addMenuItem(i18n_catalog.i18n("Update Firmware"), self.updateAllFirmware)
+        self.setMenuName("Firmware")
+        self.addMenuItem(i18n_catalog.i18n("Update"), self.updateAllFirmware)
     
     pyqtError = pyqtSignal(str, arguments = ["amount"])
     processingProgress = pyqtSignal(float, arguments = ["amount"])