Merge branch 'develop' into features/mchmmer

diff --cc help/help.jhm
Simple merge

diff --cc help/helpTOC.xml
Simple merge

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

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

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

diff --cc src/jalview/bin/Jalview.java
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