Merge remote-tracking branch 'origin/develop' into features/JAL-2316

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

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

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

diff --cc src/jalview/bin/Cache.java
index 9edd712,9363c23..48c1ee9
--- 1/src/jalview/bin/Cache.java
--- 2/src/jalview/bin/Cache.java
+++ b/src/jalview/bin/Cache.java
@@@ -21,8 -21,11 +21,12 @@@
  package jalview.bin;
  
  import jalview.datamodel.PDBEntry;
+ import jalview.gui.UserDefinedColours;
+ import jalview.schemes.ColourSchemes;
+ import jalview.schemes.UserColourScheme;
  import jalview.structure.StructureImportSettings;
 +import jalview.urls.IdOrgSettings;
+ import jalview.util.ColorUtils;
  import jalview.ws.dbsources.das.api.DasSourceRegistryI;
  import jalview.ws.dbsources.das.datamodel.DasSourceRegistry;
  import jalview.ws.sifts.SiftsSettings;

diff --cc src/jalview/gui/Preferences.java
index 0903942,d32ff46..cf80a6d
--- 1/src/jalview/gui/Preferences.java
--- 2/src/jalview/gui/Preferences.java
+++ b/src/jalview/gui/Preferences.java
@@@ -29,14 -34,11 +29,16 @@@ import jalview.io.JalviewFileChooser
  import jalview.io.JalviewFileView;
  import jalview.jbgui.GPreferences;
  import jalview.jbgui.GSequenceLink;
- import jalview.schemes.ColourSchemeProperty;
+ import jalview.schemes.ColourSchemeI;
+ import jalview.schemes.ColourSchemes;
+ import jalview.schemes.ResidueColourScheme;
 +import jalview.urls.UrlLinkTableModel;
 +import jalview.urls.api.UrlProviderFactoryI;
 +import jalview.urls.api.UrlProviderI;
 +import jalview.urls.desktop.DesktopUrlProviderFactory;
  import jalview.util.MessageManager;
  import jalview.util.Platform;
 +import jalview.util.UrlConstants;
  import jalview.ws.sifts.SiftsSettings;
  
  import java.awt.BorderLayout;