Merge branch 'develop' into spike/matrix_annot

diff --cc src/jalview/api/AlignViewportI.java
Simple merge

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

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

diff --cc src/jalview/io/AppletFormatAdapter.java
Simple merge

diff --cc src/jalview/renderer/AnnotationRenderer.java
index 1928ba3,6f84a2e..f5562d7
--- 1/src/jalview/renderer/AnnotationRenderer.java
--- 2/src/jalview/renderer/AnnotationRenderer.java
+++ b/src/jalview/renderer/AnnotationRenderer.java
@@@ -29,10 -29,10 +29,12 @@@ import jalview.datamodel.AlignmentAnnot
  import jalview.datamodel.Annotation;
  import jalview.datamodel.ColumnSelection;
  import jalview.datamodel.ProfilesI;
 +import jalview.renderer.api.AnnotationRendererFactoryI;
 +import jalview.renderer.api.AnnotationRowRendererI;
  import jalview.schemes.ColourSchemeI;
+ import jalview.schemes.NucleotideColourScheme;
  import jalview.schemes.ResidueProperties;
+ import jalview.schemes.ZappoColourScheme;
  import jalview.util.Platform;
  
  import java.awt.BasicStroke;

diff --cc src/jalview/viewmodel/AlignmentViewport.java
Simple merge