Merge branch 'bug/JAL-3633_read_proxy_settings_from_jalview_properties_in_getdown...

 Conflicts:
	src/jalview/bin/MemorySetting.java

diff --cc build.gradle
Simple merge

diff --cc gradle.properties
Simple merge

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

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

diff --cc src/jalview/bin/Launcher.java
Simple merge

diff --cc src/jalview/bin/MemorySetting.java
index 52f0c9e,cf5725c..56713b0
--- 1/src/jalview/bin/MemorySetting.java
--- 2/src/jalview/bin/MemorySetting.java
+++ b/src/jalview/bin/MemorySetting.java
@@@ -31,8 -33,7 +33,6 @@@ package jalview.bin
   * @author bsoares
   *
   */
- import java.util.Locale;
--
  public class MemorySetting
  {
    public static final String MAX_HEAPSIZE_PERCENT_PROPERTY_NAME = "jvmmempc";

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

diff --cc src/jalview/jbgui/GPreferences.java
Simple merge

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