Merge branch 'features/JAL-1605_html-svg-export' into develop

diff --cc src/jalview/bin/Jalview.java
Simple merge

diff --cc src/jalview/gui/AlignFrame.java
index be8af7b,42460dc..3273121
--- 1/src/jalview/gui/AlignFrame.java
--- 2/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@@ -1233,15 -1230,9 +1233,15 @@@ public class AlignFrame extends GAlignF
      // new HTMLOutput(alignPanel,
      // alignPanel.getSeqPanel().seqCanvas.getSequenceRenderer(),
      // alignPanel.getSeqPanel().seqCanvas.getFeatureRenderer());
-     new HtmlSvgOutput(alignPanel);
+     new HtmlSvgOutput(null, alignPanel);
    }
  
 +  @Override
 +  public void bioJSMenuItem_actionPerformed(ActionEvent e)
 +  {
 +    new BioJsHTMLOutput(alignPanel,
 +            alignPanel.getSeqPanel().seqCanvas.getFeatureRenderer());
 +  }
    public void createImageMap(File file, String image)
    {
      alignPanel.makePNGImageMap(file, image);

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