Merge remote-tracking branch 'origin/master'

src/bk/ConflictDetection.java

@@ -92,6 +92,8 @@ public class ConflictDetection implements AlgorithmStage {
             {
                 i--;
                 l1--;
+                ((PseudoCodeNode)markNode.getParent()).setSelected( false );
+                markNode.setSelected( false );
                 return StageStatus.FINISHED;
             }
             l1 = 0;

src/view/MainView.java

@@ -237,6 +237,7 @@ public class MainView {
         });
         pseudoTree = new JTree( algorithm.createPseudocodeTree() );
         pseudoTree.setCellRenderer( new PseudoCodeRenderer() );
+        pseudoTree.setSelectionModel( null );
         JScrollPane treeView = new JScrollPane( pseudoTree );
         treeView.setBounds( 10,  110,  380, 380 );