Merge branch 'merge/develop_JAL-1780_JAL-653_JAL-1892' into features/JAL-653_JAL...

diff --cc .classpath
Simple merge

diff --cc src/jalview/io/FeaturesFile.java
index 601cdb1,57f6384..60c6bbd
--- 1/src/jalview/io/FeaturesFile.java
--- 2/src/jalview/io/FeaturesFile.java
+++ b/src/jalview/io/FeaturesFile.java
@@@ -171,14 -170,16 +170,14 @@@ public class FeaturesFile extends Align
    }
  
    @Override
-   public void addAnnotations(Alignment al)
+   public void addAnnotations(AlignmentI al)
    {
 -    // TODO Auto-generated method stub
      super.addAnnotations(al);
    }
  
    @Override
-   public void addProperties(Alignment al)
+   public void addProperties(AlignmentI al)
    {
 -    // TODO Auto-generated method stub
      super.addProperties(al);
    }