JAL-2089 Merge branch releases/Release_2_10_Branch to master

diff --cc build.xml
Simple merge

diff --cc doc/AddingGroovySupport.html
Simple merge

diff --cc doc/building.html
Simple merge

diff --cc examples/appletParameters.html
Simple merge

diff --cc examples/applets.html
Simple merge

diff --cc examples/embedded.html
Simple merge

diff --cc examples/formComplete.html
Simple merge

diff --cc examples/groovy/printtitle.groovy
Simple merge

diff --cc examples/includes/nav_jv.html
Simple merge

diff --cc examples/javascriptLaunch.html
Simple merge

diff --cc examples/linkedapplets_ng.html
Simple merge

diff --cc help/help.jhm
Simple merge

diff --cc help/helpTOC.xml
Simple merge

diff --cc help/html/calculations/consensus.html
Simple merge

diff --cc help/html/calculations/conservation.html
Simple merge

diff --cc help/html/calculations/pca.html
Simple merge

diff --cc help/html/calculations/quality.html
Simple merge

diff --cc help/html/calculations/redundancy.html
Simple merge

diff --cc help/html/calculations/referenceseq.html
Simple merge

diff --cc help/html/calculations/scorematrices.html
Simple merge

diff --cc help/html/calculations/sorting.html
Simple merge

diff --cc help/html/calculations/structureconsensus.html
Simple merge

diff --cc help/html/calculations/tree.html
Simple merge

diff --cc help/html/calculations/treeviewer.html
Simple merge

diff --cc help/html/colourSchemes/annotationColouring.html
Simple merge

diff --cc help/html/colourSchemes/conservation.html
Simple merge

diff --cc help/html/colourSchemes/index.html
Simple merge

diff --cc help/html/colourSchemes/rnahelicesColouring.html
Simple merge

diff --cc help/html/editing/index.html
Simple merge

diff --cc help/html/features/annotation.html
Simple merge

diff --cc help/html/features/annotationsFormat.html
Simple merge

diff --cc help/html/features/bioJsonFormat.html
Simple merge

diff --cc help/html/features/chimera.html
Simple merge

diff --cc help/html/features/clarguments.html
Simple merge

diff --cc help/html/features/columnFilterByAnnotation.html
Simple merge

diff --cc help/html/features/commandline.html
Simple merge

diff --cc help/html/features/creatinFeatures.html
Simple merge

diff --cc help/html/features/dasfeatures.html
Simple merge

diff --cc help/html/features/dassettings.html
Simple merge

diff --cc help/html/features/editingFeatures.html
Simple merge

diff --cc help/html/features/featuresFormat.html
Simple merge

diff --cc help/html/features/featuresettings.html
Simple merge

diff --cc help/html/features/groovy.html
Simple merge

diff --cc help/html/features/hiddenRegions.html
Simple merge

diff --cc help/html/features/jmol.html
Simple merge

diff --cc help/html/features/multipleViews.html
Simple merge

diff --cc help/html/features/pdbsequencefetcher.html
Simple merge

diff --cc help/html/features/pdbviewer.html
Simple merge

diff --cc help/html/features/preferences.html
Simple merge

diff --cc help/html/features/seqfeatures.html
Simple merge

diff --cc help/html/features/seqfetch.html
Simple merge

diff --cc help/html/features/seqmappings.html
Simple merge

diff --cc help/html/features/splitView.html
Simple merge

diff --cc help/html/features/structurechooser.html
Simple merge

diff --cc help/html/features/varna.html
Simple merge

diff --cc help/html/features/viewingpdbs.html
Simple merge

diff --cc help/html/features/xsspannotation.html
Simple merge

diff --cc help/html/index.html
Simple merge

diff --cc help/html/io/export.html
Simple merge

diff --cc help/html/io/exportseqreport.html
Simple merge

diff --cc help/html/io/fileformats.html
Simple merge

diff --cc help/html/io/index.html
Simple merge

diff --cc help/html/io/modellerpir.html
Simple merge

diff --cc help/html/io/tcoffeescores.html
Simple merge

diff --cc help/html/keys.html
Simple merge

diff --cc help/html/memory.html
Simple merge

diff --cc help/html/menus/alignmentMenu.html
Simple merge

diff --cc help/html/menus/alwannotation.html
Simple merge

diff --cc help/html/menus/alwannotationpanel.html
Simple merge

diff --cc help/html/menus/alwcalculate.html
Simple merge

diff --cc help/html/menus/alwedit.html
Simple merge

diff --cc help/html/menus/alwfile.html
Simple merge

diff --cc help/html/menus/alwformat.html
Simple merge

diff --cc help/html/menus/alwselect.html
Simple merge

diff --cc help/html/menus/desktopMenu.html
Simple merge

diff --cc help/html/menus/index.html
Simple merge

diff --cc help/html/menus/popupMenu.html
Simple merge

diff --cc help/html/menus/wsmenu.html
Simple merge

diff --cc help/html/na/index.html
Simple merge

diff --cc help/html/privacy.html
Simple merge

diff --cc help/html/releases.html
Simple merge

diff --cc help/html/vamsas/index.html
Simple merge

diff --cc help/html/webServices/AACon.html
Simple merge

diff --cc help/html/webServices/JABAWS.html
Simple merge

diff --cc help/html/webServices/RNAalifold.html
Simple merge

diff --cc help/html/webServices/dbreffetcher.html
Simple merge

diff --cc help/html/webServices/index.html
Simple merge

diff --cc help/html/webServices/jnet.html
Simple merge

diff --cc help/html/webServices/msaclient.html
Simple merge

diff --cc help/html/webServices/newsreader.html
Simple merge

diff --cc help/html/webServices/proteinDisorder.html
Simple merge

diff --cc help/html/webServices/shmr.html
Simple merge

diff --cc help/html/webServices/urllinks.html
Simple merge

diff --cc help/html/webServices/webServicesParams.html
Simple merge

diff --cc help/html/webServices/webServicesPrefs.html
Simple merge

diff --cc help/html/whatsNew.html
Simple merge

diff --cc resources/embl_mapping.xml
Simple merge

diff --cc schemas/jalview.xsd
Simple merge

diff --cc src/MCview/AppletPDBCanvas.java
Simple merge

diff --cc src/MCview/Atom.java
Simple merge

diff --cc src/MCview/PDBCanvas.java
Simple merge

diff --cc src/MCview/PDBChain.java
Simple merge

diff --cc src/MCview/PDBViewer.java
Simple merge

diff --cc src/MCview/PDBfile.java
Simple merge

diff --cc src/MCview/Residue.java
Simple merge

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --cc src/jalview/analysis/scoremodels/FeatureScoreModel.java
Simple merge

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

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

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

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

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

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

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

diff --cc src/jalview/appletgui/APopupMenu.java
Simple merge

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

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

diff --cc src/jalview/appletgui/AlignmentPanel.java
Simple merge

diff --cc src/jalview/appletgui/AnnotationColourChooser.java
Simple merge

diff --cc src/jalview/appletgui/AnnotationColumnChooser.java
Simple merge

diff --cc src/jalview/appletgui/AnnotationLabels.java
Simple merge

diff --cc src/jalview/appletgui/AnnotationPanel.java
Simple merge

diff --cc src/jalview/appletgui/AnnotationRowFilter.java
Simple merge

diff --cc src/jalview/appletgui/AppletJmol.java
Simple merge

diff --cc src/jalview/appletgui/CutAndPasteTransfer.java
Simple merge

diff --cc src/jalview/appletgui/FeatureColourChooser.java
Simple merge

diff --cc src/jalview/appletgui/FeatureRenderer.java
Simple merge

diff --cc src/jalview/appletgui/FeatureSettings.java
Simple merge

diff --cc src/jalview/appletgui/IdCanvas.java
Simple merge

diff --cc src/jalview/appletgui/IdPanel.java
Simple merge

diff --cc src/jalview/appletgui/OverviewPanel.java
Simple merge

diff --cc src/jalview/appletgui/ScalePanel.java
Simple merge

diff --cc src/jalview/appletgui/SeqCanvas.java
Simple merge

diff --cc src/jalview/appletgui/SeqPanel.java
Simple merge

diff --cc src/jalview/appletgui/SequenceRenderer.java
Simple merge

diff --cc src/jalview/appletgui/SliderPanel.java
Simple merge

diff --cc src/jalview/appletgui/TreeCanvas.java
Simple merge

diff --cc src/jalview/appletgui/UserDefinedColours.java
Simple merge

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

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

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

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

diff --cc src/jalview/commands/TrimRegionCommand.java
Simple merge

diff --cc src/jalview/controller/AlignViewController.java
Simple merge

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --cc src/jalview/datamodel/xdb/embl/EmblEntry.java
Simple merge

diff --cc src/jalview/datamodel/xdb/embl/EmblFeature.java
Simple merge

diff --cc src/jalview/datamodel/xdb/embl/EmblFile.java
Simple merge

diff --cc src/jalview/datamodel/xdb/embl/EmblSequence.java
Simple merge

diff --cc src/jalview/ext/jmol/JalviewJmolBinding.java
Simple merge

diff --cc src/jalview/ext/jmol/JmolCommands.java
Simple merge

diff --cc src/jalview/ext/paradise/Annotate3D.java
Simple merge

diff --cc src/jalview/ext/rbvi/chimera/ChimeraCommands.java
Simple merge

diff --cc src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
Simple merge

diff --cc src/jalview/fts/api/FTSData.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/gui/AlignmentPanel.java
Simple merge

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --cc src/jalview/io/packed/JalviewDataset.java
Simple merge

diff --cc src/jalview/io/packed/ParsePackedSet.java
Simple merge

diff --cc src/jalview/io/vamsas/Datasetsequence.java
Simple merge

diff --cc src/jalview/io/vamsas/DatastoreRegistry.java
Simple merge

diff --cc src/jalview/io/vamsas/Sequencefeature.java
Simple merge

diff --cc src/jalview/io/vamsas/Sequencemapping.java
Simple merge

diff --cc src/jalview/io/vamsas/Tree.java
Simple merge

diff --cc src/jalview/javascript/JSFunctionExec.java
Simple merge

diff --cc src/jalview/javascript/JsSelectionSender.java
Simple merge

diff --cc src/jalview/javascript/MouseOverStructureListener.java
Simple merge

diff --cc src/jalview/jbgui/GAlignFrame.java
Simple merge

diff --cc src/jalview/jbgui/GCutAndPasteHtmlTransfer.java
Simple merge

diff --cc src/jalview/jbgui/GCutAndPasteTransfer.java
Simple merge

diff --cc src/jalview/jbgui/GPreferences.java
Simple merge

diff --cc src/jalview/jbgui/GStructureViewer.java
Simple merge

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

diff --cc src/jalview/renderer/seqfeatures/FeatureRenderer.java
Simple merge

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

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

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

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

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

diff --cc src/jalview/structure/StructureMapping.java
Simple merge

diff --cc src/jalview/structure/StructureSelectionManager.java
Simple merge

diff --cc src/jalview/structures/models/AAStructureBindingModel.java
Simple merge

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

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

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

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

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

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

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

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

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

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

diff --cc src/jalview/viewmodel/seqfeatures/FeatureRendererModel.java
Simple merge

diff --cc src/jalview/viewmodel/seqfeatures/FeatureRendererSettings.java
Simple merge

diff --cc src/jalview/viewmodel/seqfeatures/FeaturesDisplayed.java
Simple merge

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

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

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

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

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

diff --cc src/jalview/ws/AWSThread.java
Simple merge

diff --cc src/jalview/ws/DBRefFetcher.java
Simple merge

diff --cc src/jalview/ws/DasSequenceFeatureFetcher.java
Simple merge

diff --cc src/jalview/ws/SequenceFetcher.java
Simple merge

diff --cc src/jalview/ws/dbsources/EmblCdsSource.java
Simple merge

diff --cc src/jalview/ws/dbsources/EmblSource.java
Simple merge

diff --cc src/jalview/ws/dbsources/EmblXmlSource.java
Simple merge

diff --cc src/jalview/ws/dbsources/GeneDbSource.java
Simple merge

diff --cc src/jalview/ws/dbsources/Pdb.java
Simple merge

diff --cc src/jalview/ws/dbsources/Pfam.java
Simple merge

diff --cc src/jalview/ws/dbsources/PfamFull.java
Simple merge

diff --cc src/jalview/ws/dbsources/PfamSeed.java
Simple merge

diff --cc src/jalview/ws/dbsources/Rfam.java
Simple merge

diff --cc src/jalview/ws/dbsources/RfamFull.java
Simple merge

diff --cc src/jalview/ws/dbsources/RfamSeed.java
Simple merge

diff --cc src/jalview/ws/dbsources/Uniprot.java
Simple merge

diff --cc src/jalview/ws/dbsources/UniprotName.java
Simple merge

diff --cc src/jalview/ws/dbsources/Xfam.java
Simple merge

diff --cc src/jalview/ws/dbsources/das/datamodel/DasSourceRegistry.java
Simple merge

diff --cc src/jalview/ws/ebi/EBIFetchClient.java
Simple merge

diff --cc src/jalview/ws/jws1/JPredThread.java
Simple merge

diff --cc src/jalview/ws/jws1/MsaWSClient.java
Simple merge

diff --cc src/jalview/ws/jws1/MsaWSThread.java
Simple merge

diff --cc src/jalview/ws/jws1/SeqSearchWSClient.java
Simple merge

diff --cc src/jalview/ws/jws1/SeqSearchWSThread.java
Simple merge

diff --cc src/jalview/ws/jws2/AADisorderClient.java
Simple merge

diff --cc src/jalview/ws/jws2/AbstractJabaCalcWorker.java
Simple merge

diff --cc src/jalview/ws/jws2/JPred301Client.java
Simple merge

diff --cc src/jalview/ws/jws2/Jws2Client.java
Simple merge

diff --cc src/jalview/ws/jws2/MsaWSClient.java
Simple merge

diff --cc src/jalview/ws/jws2/MsaWSThread.java
Simple merge

diff --cc src/jalview/ws/jws2/RNAalifoldClient.java
Simple merge

diff --cc src/jalview/ws/jws2/SequenceAnnotationWSClient.java
Simple merge

diff --cc src/jalview/ws/seqfetcher/ASequenceFetcher.java
Simple merge

diff --cc src/jalview/ws/seqfetcher/DbSourceProxy.java
Simple merge

diff --cc src/jalview/ws/seqfetcher/DbSourceProxyImpl.java
Simple merge

diff --cc test/MCview/AtomTest.java
Simple merge

diff --cc test/MCview/PDBChainTest.java
Simple merge

diff --cc test/MCview/PDBfileTest.java
Simple merge

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

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

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

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

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

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

diff --cc test/jalview/analysis/scoremodels/FeatureScoreModelTest.java
Simple merge

diff --cc test/jalview/commands/EditCommandTest.java
Simple merge

diff --cc test/jalview/datamodel/AlignedCodonFrameTest.java
Simple merge

diff --cc test/jalview/datamodel/AlignmentAnnotationTests.java
Simple merge

diff --cc test/jalview/datamodel/AlignmentTest.java
Simple merge

diff --cc test/jalview/datamodel/ColumnSelectionTest.java
Simple merge

diff --cc test/jalview/datamodel/DBRefEntryTest.java
Simple merge

diff --cc test/jalview/datamodel/MappingTest.java
Simple merge

diff --cc test/jalview/datamodel/SearchResultsTest.java
Simple merge

diff --cc test/jalview/datamodel/SeqCigarTest.java
Simple merge

diff --cc test/jalview/datamodel/SequenceDummyTest.java
Simple merge

diff --cc test/jalview/datamodel/SequenceTest.java
Simple merge

diff --cc test/jalview/datamodel/xdb/embl/EmblFileTest.java
Simple merge

diff --cc test/jalview/ext/jmol/JmolViewerTest.java
Simple merge

diff --cc test/jalview/ext/paradise/TestAnnotate3D.java
Simple merge

diff --cc test/jalview/ext/rbvi/chimera/JalviewChimeraView.java
Simple merge

diff --cc test/jalview/fts/service/pdb/PDBFTSPanelTest.java
Simple merge

diff --cc test/jalview/fts/service/pdb/PDBFTSRestClientTest.java
Simple merge

diff --cc test/jalview/gui/AlignViewportTest.java
Simple merge

diff --cc test/jalview/gui/AnnotationChooserTest.java
Simple merge

diff --cc test/jalview/gui/JAL1353bugdemo.java
Simple merge

diff --cc test/jalview/gui/PaintRefresherTest.java
Simple merge

diff --cc test/jalview/gui/StructureChooserTest.java
Simple merge

diff --cc test/jalview/io/AnnotatedPDBFileInputTest.java
Simple merge

diff --cc test/jalview/io/AnnotationFileIOTest.java
Simple merge

diff --cc test/jalview/io/FeaturesFileTest.java
Simple merge

diff --cc test/jalview/io/FileIOTester.java
Simple merge

diff --cc test/jalview/io/HtmlFileTest.java
Simple merge

diff --cc test/jalview/io/IdentifyFileTest.java
Simple merge

diff --cc test/jalview/io/JSONFileTest.java
Simple merge

diff --cc test/jalview/io/Jalview2xmlTests.java
Simple merge

diff --cc test/jalview/io/JalviewExportPropertiesTests.java
Simple merge

diff --cc test/jalview/io/NewickFileTests.java
Simple merge

diff --cc test/jalview/io/RNAMLfileTest.java
Simple merge

diff --cc test/jalview/io/StockholmFileTest.java
Simple merge

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

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

diff --cc test/jalview/structure/Mapping.java
Simple merge

diff --cc test/jalview/structure/StructureSelectionManagerTest.java
Simple merge

diff --cc test/jalview/util/ColorUtilsTest.java
Simple merge

diff --cc test/jalview/util/ComparisonTest.java
Simple merge

diff --cc test/jalview/util/DBRefUtilsTest.java
Simple merge

diff --cc test/jalview/util/MapListTest.java
Simple merge

diff --cc test/jalview/util/MappingUtilsTest.java
Simple merge

diff --cc test/jalview/util/QuickSortTest.java
Simple merge

diff --cc test/jalview/util/StringUtilsTest.java
Simple merge

diff --cc test/jalview/ws/PDBSequenceFetcherTest.java
Simple merge

diff --cc test/jalview/ws/dbsources/UniprotTest.java
Simple merge

diff --cc test/jalview/ws/gui/Jws2ParamView.java
Simple merge

diff --cc test/jalview/ws/jabaws/DisorderAnnotExportImport.java
Simple merge

diff --cc test/jalview/ws/jabaws/JalviewJabawsTestUtils.java
Simple merge

diff --cc test/jalview/ws/jabaws/JpredJabaStructExportImport.java
Simple merge

diff --cc test/jalview/ws/jabaws/RNAStructExportImport.java
index ea05b6b,7bb6bdd..9499d48
--- 1/test/jalview/ws/jabaws/RNAStructExportImport.java
--- 2/test/jalview/ws/jabaws/RNAStructExportImport.java
+++ b/test/jalview/ws/jabaws/RNAStructExportImport.java
@@@ -47,11 -50,13 +50,14 @@@ import org.testng.annotations.AfterClas
  import org.testng.annotations.BeforeClass;
  import org.testng.annotations.Test;
  
+ import compbio.metadata.Argument;
  import compbio.metadata.WrongParameterException;
  
 +
  public class RNAStructExportImport
  {
+   private static final String JAR_FILE_NAME = "testRnalifold_param.jar";
+ 
    public static String testseqs = "examples/RF00031_folded.stk";
  
    public static Jws2Discoverer disc;

diff --cc test/jalview/ws/jws2/ParameterUtilsTest.java
Simple merge

diff --cc test/jalview/ws/seqfetcher/DbRefFetcherTest.java
Simple merge

diff --cc utils/InstallAnywhere/Jalview.iap_xml
Simple merge

diff --cc utils/JettyExamplesDir.java
Simple merge

diff --cc utils/getJavaVersion.java
Simple merge

diff --cc utils/help2Website.java
Simple merge