Merge branch 'develop' into Jalview-JS/develop

diff --cc src/jalview/gui/PopupMenu.java
index 37defd0,702773b..4193143
--- 1/src/jalview/gui/PopupMenu.java
--- 2/src/jalview/gui/PopupMenu.java
+++ b/src/jalview/gui/PopupMenu.java
@@@ -74,20 -71,15 +74,18 @@@ import java.util.Vector
  
  import javax.swing.ButtonGroup;
  import javax.swing.JCheckBoxMenuItem;
 -import javax.swing.JColorChooser;
 +import javax.swing.JInternalFrame;
 +import javax.swing.JLabel;
  import javax.swing.JMenu;
  import javax.swing.JMenuItem;
 +import javax.swing.JPanel;
  import javax.swing.JPopupMenu;
  import javax.swing.JRadioButtonMenuItem;
 +import javax.swing.JScrollPane;
  
  /**
-  * DOCUMENT ME!
-  * 
-  * @author $author$
-  * @version $Revision: 1.118 $
+  * The popup menu that is displayed on right-click on a sequence id, or in the
+  * sequence alignment.
   */
  public class PopupMenu extends JPopupMenu implements ColourChangeListener
  {

diff --cc src/jalview/util/UrlLink.java
Simple merge

diff --cc test/jalview/gui/PopupMenuTest.java
Simple merge