Merge branch 'develop' into features/JAL-2360colourSchemeApplicability

Conflicts:
	src/jalview/appletgui/APopupMenu.java
	src/jalview/appletgui/SliderPanel.java
	src/jalview/gui/PopupMenu.java

diff --cc src/jalview/appletgui/APopupMenu.java
index 1f3d318,bf985d7..863d625
--- 1/src/jalview/appletgui/APopupMenu.java
--- 2/src/jalview/appletgui/APopupMenu.java
+++ b/src/jalview/appletgui/APopupMenu.java
@@@ -1078,20 -1012,14 +1078,23 @@@ public class APopupMenu extends java.aw
      userDefinedColour.setLabel(MessageManager
              .getString("action.user_defined"));
      userDefinedColour.addActionListener(this);
 -    PIDColour.setLabel(MessageManager
 -            .getString("label.percentage_identity"));
 +
 +    abovePIDColour.setLabel(MessageManager
 +            .getString("label.above_identity_threshold"));
 +    abovePIDColour.addItemListener(this);
 +    modifyPID.setLabel(MessageManager
 +            .getString("label.modify_identity_threshold"));
 +    modifyPID.addActionListener(this);
 +    conservationColour.setLabel(MessageManager
 +            .getString("action.by_conservation"));
 +    conservationColour.addItemListener(this);
 +    modifyConservation.setLabel(MessageManager
 +            .getString("label.modify_conservation_threshold"));
 +    modifyConservation.addActionListener(this);
 +
+     PIDColour.addActionListener(this);
 -    BLOSUM62Colour.setLabel("BLOSUM62");
+     BLOSUM62Colour.addActionListener(this);
 -    conservationMenuItem.setLabel(MessageManager
 -            .getString("action.by_conservation"));
+ 
      editMenu.add(copy);
      copy.addActionListener(this);
      editMenu.add(cut);

diff --cc src/jalview/appletgui/SliderPanel.java
Simple merge

diff --cc src/jalview/gui/Jalview2XML.java
Simple merge