JAL-3210 Merge branch 'develop' into trialMerge

Conflicts:
	.classpath
	.project
	.settings/org.eclipse.jdt.core.prefs
	.settings/org.eclipse.jdt.ui.prefs
	build.xml
	resources/lang/Messages_es.properties
	src/MCview/AppletPDBCanvas.java
	src/MCview/Atom.java
	src/MCview/PDBCanvas.java
	src/jalview/analysis/AAFrequency.java
	src/jalview/appletgui/EmbmenuFrame.java
	src/jalview/appletgui/OverviewPanel.java
	src/jalview/appletgui/SeqPanel.java
	src/jalview/bin/Cache.java
	src/jalview/bin/Jalview.java
	src/jalview/datamodel/DBRefEntry.java
	src/jalview/datamodel/Sequence.java
	src/jalview/ext/ensembl/EnsemblMap.java
	src/jalview/ext/paradise/Annotate3D.java
	src/jalview/fts/service/pdb/PDBFTSRestClient.java
	src/jalview/gui/Desktop.java
	src/jalview/gui/FeatureRenderer.java
	src/jalview/gui/FeatureTypeSettings.java
	src/jalview/gui/WebserviceInfo.java
	src/jalview/io/BackupFiles.java
	src/jalview/io/FileLoader.java
	src/jalview/jbgui/GDesktop.java
	src/jalview/jbgui/GPreferences.java
	src/jalview/project/Jalview2XML.java
	src/jalview/util/ImageMaker.java
	src/jalview/util/Platform.java
	src/jalview/ws/SequenceFetcher.java