Merge branch 'develop' into features/JAL-1812_JAL-2083_groovyBinding

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

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

diff --cc src/jalview/bin/Jalview.java
index 2d068a4,d0b3232..76ae3ff
--- 1/src/jalview/bin/Jalview.java
--- 2/src/jalview/bin/Jalview.java
+++ b/src/jalview/bin/Jalview.java
@@@ -173,15 -90,7 +173,16 @@@ public class Jalvie
     */
    public static void main(String[] args)
    {
 +    instance = new Jalview();
 +    instance.doMain(args);
 +  }
 +
 +  /**
 +   * @param args
 +   */
 +  void doMain(String[] args)
 +  {
+     System.setSecurityManager(null);
      System.out.println("Java version: "
              + System.getProperty("java.version"));
      System.out.println(System.getProperty("os.arch") + " "

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

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