Merge branch 'releases/Release_2_10_0_Branch'

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

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

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

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

diff --cc resources/embl_mapping.xml
Simple merge

diff --cc resources/uniprot_mapping.xml
Simple merge

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --cc src/jalview/gui/StructureViewer.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/DBRefUtils.java
Simple merge

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

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

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

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

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

diff --cc test/jalview/structures/models/AAStructureBindingModelTest.java
Simple merge

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