Merge branch 'releases/Release_2_10_4_Branch' into develop

Conflicts:
	.classpath

diff --cc .classpath
index f4b8cf8,3a05b47..0cdc4b9
--- 1/.classpath
--- 2/.classpath
+++ b/.classpath
@@@ -48,6 -48,8 +48,7 @@@
        <classpathentry kind="lib" path="lib/VARNAv3-93.jar"/>
        <classpathentry kind="lib" path="lib/jfreesvg-2.1.jar"/>
        <classpathentry kind="lib" path="lib/quaqua-filechooser-only-8.0.jar"/>
 -      <classpathentry kind="lib" path="lib/htsjdk-1.133.jar"/>
+       <classpathentry kind="lib" path="lib/VAqua4.jar"/>
        <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/plugin"/>
        <classpathentry kind="lib" path="lib/xml-apis.jar"/>
        <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>

diff --cc resources/lang/Messages.properties
Simple merge

diff --cc resources/lang/Messages_es.properties
Simple merge

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

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

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

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

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