Merge branch 'features/JAL-1553_select-columns-by-annotation' into develop

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

diff --cc src/jalview/gui/AlignViewport.java
index dd61c79,cff9e94..29d936f
--- 1/src/jalview/gui/AlignViewport.java
--- 2/src/jalview/gui/AlignViewport.java
+++ b/src/jalview/gui/AlignViewport.java
@@@ -138,9 -148,10 +138,9 @@@ public class AlignViewport extends Alig
    Color textColour = Color.black;
  
    Color textColour2 = Color.white;
 -
    private boolean rightAlignIds = false;
  
-   private AnnotationColumnSelection currentAnnotationColumnSelectionState;
+   private AnnotationColumnChooser currentAnnotationColumnSelectionState;
    /**
     * Creates a new AlignViewport object.
     *