Merge branch 'develop' into features/JAL-2393customMatrices

diff --cc resources/lang/Messages.properties
Simple merge

diff --cc resources/lang/Messages_es.properties
index def3998,6b8761e..46fd4b5
--- 1/resources/lang/Messages_es.properties
--- 2/resources/lang/Messages_es.properties
+++ b/resources/lang/Messages_es.properties
@@@ -1290,4 -1288,4 +1290,4 @@@ label.edit_sequence_url_link = Editar l
  warn.name_cannot_be_duplicate = Los nombres URL definidos por el usuario deben ser únicos y no pueden ser ids de MIRIAM
  label.invalid_name = Nombre inválido !
  label.output_seq_details = Seleccionar Detalles de la secuencia para ver todas
--label.urllinks = Enlaces
++label.urllinks = Enlaces

diff --cc src/MCview/AppletPDBCanvas.java
Simple merge

diff --cc src/MCview/PDBCanvas.java
Simple merge

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

diff --cc src/jalview/appletgui/AlignViewport.java
index f204462,065c503..0dcd543
--- 1/src/jalview/appletgui/AlignViewport.java
--- 2/src/jalview/appletgui/AlignViewport.java
+++ b/src/jalview/appletgui/AlignViewport.java
@@@ -299,10 -297,10 +297,10 @@@ public class AlignViewport extends Alig
  
    public void resetSeqLimits(int height)
    {
-     setEndSeq(height / getCharHeight());
+     ranges.setEndSeq(height / getCharHeight());
    }
  
 -  public void setCurrentTree(NJTree tree)
 +  public void setCurrentTree(TreeModel tree)
    {
      currentTree = tree;
    }

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

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

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

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

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

diff --cc src/jalview/structure/StructureSelectionManager.java
Simple merge

diff --cc src/jalview/ws/sifts/SiftsClient.java
Simple merge