Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop

diff --cc examples-jbake/templates/jvl_examples.ftl
Simple merge

diff --cc examples/applets.html
Simple merge

diff --cc src/jalview/analysis/AAFrequency.java
Simple merge

diff --cc src/jalview/analysis/AlignmentUtils.java
Simple merge

diff --cc src/jalview/analysis/StructureFrequency.java
Simple merge

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

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

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

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

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

diff --cc src/jalview/renderer/AnnotationRenderer.java
Simple merge

diff --cc src/jalview/schemes/ResidueProperties.java
Simple merge

diff --cc src/jalview/util/Format.java
Simple merge

diff --cc src/jalview/util/QuickSort.java
Simple merge

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

diff --cc src/jalview/workers/AlignCalcManager.java
Simple merge

diff --cc src/jalview/workers/ConsensusThread.java
Simple merge

diff --cc test/jalview/analysis/AlignmentUtilsTests.java
Simple merge

diff --cc test/jalview/schemes/DnaCodonTests.java
Simple merge