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

diff --combined src/jalview/appletgui/SliderPanel.java
index 53a2824,3e6dbe6..b52fae9
--- 1/src/jalview/appletgui/SliderPanel.java
--- 2/src/jalview/appletgui/SliderPanel.java
+++ b/src/jalview/appletgui/SliderPanel.java
@@@ -73,6 -73,7 +73,7 @@@ public class SliderPanel extends Panel 
      else
      {
        sp = (SliderPanel) conservationSlider.getComponent(0);
+       sp.valueField.setText(String.valueOf(cs.getConservationInc()));
        sp.cs = cs;
      }
  
@@@ -132,6 -133,7 +133,7 @@@
      else
      {
        pid = (SliderPanel) PIDSlider.getComponent(0);
+       pid.valueField.setText(String.valueOf(cs.getThreshold()));
        pid.cs = cs;
      }
      PIDSlider
@@@ -191,7 -193,7 +193,7 @@@
    }
  
    /**
 -   * Hides the conservation slider panel if it is shown
 +   * Hides the Conservation slider panel if it is shown
     */
    public static void hideConservationSlider()
    {