merge commit

diff --cc .classpath
index 59772ae,1714959..a1fb44d
--- 1/.classpath
--- 2/.classpath
+++ b/.classpath
@@@ -52,7 -51,9 +52,10 @@@
        <classpathentry kind="lib" path="lib/xml-apis.jar"/>
        <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 -      <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Plugin.jar"/>
 +      <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/plugin"/>
 +      <classpathentry kind="lib" path="lib/jfreesvg-2.1.jar"/>
+       <classpathentry kind="lib" path="lib/quaqua-filechooser-only.jar"/>
++      
++      
        <classpathentry kind="output" path="classes"/>
  </classpath>

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