Merge branch 'master' into 'dev_preferences'

# Conflicts:
#   src/main/java/edu/mit/blocks/codeblocks/InfixBlockShape.java
#   src/main/java/edu/mit/blocks/workspace/ContextMenu.java

src/main/java/edu/mit/blocks/workspace/ContextMenu.java

@@ -82,11 +82,6 @@ public class ContextMenu extends PopupMenu implements ActionListener {
     	cloneAllItem1.addActionListener(rndBlockMenu);
         addCommentMenu.add(cloneAllItem1);
         
-        refrenceItem = new MenuItem(uiMessageBundle.getString("ardublock.ui.reference"));
-        refrenceItem.setActionCommand(OPEN_REFERENCE);
-        refrenceItem.addActionListener(rndBlockMenu);
-        addCommentMenu.add(refrenceItem);
-        
         addCommentMenuInit = true;
         
     }
@@ -115,11 +110,6 @@ public class ContextMenu extends PopupMenu implements ActionListener {
     	cloneAllItem2.addActionListener(rndBlockMenu);
     	removeCommentMenu.add(cloneAllItem2);
         
-        refrenceItem = new MenuItem(uiMessageBundle.getString("ardublock.ui.reference"));
-        refrenceItem.setActionCommand(OPEN_REFERENCE);
-        refrenceItem.addActionListener(rndBlockMenu);
-        removeCommentMenu.add(refrenceItem);
-        
         removeCommentMenuInit = true;
     }
 
@@ -171,6 +161,7 @@ public class ContextMenu extends PopupMenu implements ActionListener {
         return null;
     }
     
+<<<<<<< d9a986a828726b1e45728775df9d1d8a29dab891
     /**
      * opens reference-file (html) for active block 
      * in standard browser
@@ -369,6 +360,8 @@ public class ContextMenu extends PopupMenu implements ActionListener {
     	}
         return;
     }
+=======
+>>>>>>> 96d591de06c7d786793f059145b4f9a934b0675e
 
     public void actionPerformed(ActionEvent a) {
         if (a.getActionCommand() == ARRANGE_ALL_BLOCKS) {
@@ -398,11 +391,5 @@ public class ContextMenu extends PopupMenu implements ActionListener {
                 ((RenderableBlock) activeComponent).cloneMe(false);
             }
         }
-        else if (a.getActionCommand() == OPEN_REFERENCE) {
-        	//notify the renderableblock componenet that lauched the conetxt menu
-            if (activeComponent != null && activeComponent instanceof RenderableBlock) {
-            	createReferenceWindow(((RenderableBlock) activeComponent).getBlock().getGenusName());
-            }
-        }
     }
 }