Merge branch 'develop' into feature/JAL-2759

Conflicts:
	benchmarking/src/main/java/org/jalview/HiddenColumnsBenchmark.java
	src/jalview/gui/AlignViewport.java

diff --cc benchmarking/README
Simple merge

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

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

diff --cc src/jalview/datamodel/Sequence.java
Simple merge

diff --cc src/jalview/datamodel/SequenceI.java
Simple merge

diff --cc src/jalview/gui/AlignViewport.java
index 14c4022,4d09084..0e93da9
--- 1/src/jalview/gui/AlignViewport.java
--- 2/src/jalview/gui/AlignViewport.java
+++ b/src/jalview/gui/AlignViewport.java
@@@ -22,7 -22,7 +22,6 @@@ package jalview.gui
  
  import jalview.analysis.AlignmentUtils;
  import jalview.analysis.AnnotationSorter.SequenceAnnotationOrder;
--import jalview.analysis.TreeModel;
  import jalview.api.AlignViewportI;
  import jalview.api.AlignmentViewPanel;
  import jalview.api.FeatureColourI;
@@@ -36,7 -36,7 +35,6 @@@ import jalview.datamodel.Alignment
  import jalview.datamodel.AlignmentI;
  import jalview.datamodel.ColumnSelection;
  import jalview.datamodel.HiddenColumns;
--import jalview.datamodel.PDBEntry;
  import jalview.datamodel.SearchResults;
  import jalview.datamodel.SearchResultsI;
  import jalview.datamodel.SequenceGroup;
@@@ -58,11 -58,10 +56,9 @@@ import java.awt.Dimension
  import java.awt.Font;
  import java.awt.FontMetrics;
  import java.awt.Rectangle;
--import java.util.ArrayList;
  import java.util.Hashtable;
 +import java.util.Iterator;
  import java.util.List;
--import java.util.Vector;
  
  import javax.swing.JInternalFrame;
  

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

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

diff --cc test/jalview/datamodel/SequenceTest.java
Simple merge