Merge branch 'JAL-980_jmol_patch' into develop

diff --cc nbproject/project.properties
index 91f74d6,878d309..c4ed0c8
--- 1/nbproject/project.properties
--- 2/nbproject/project.properties
+++ b/nbproject/project.properties
@@@ -59,11 -59,11 +59,11 @@@ file.reference.jalview-src=sr
  file.reference.jaxrpc.jar=lib/jaxrpc.jar
  file.reference.JGoogleAnalytics_0.3.jar=lib/JGoogleAnalytics_0.3.jar
  file.reference.jhall.jar=lib/jhall.jar
- file.reference.Jmol-12.1.13.jar=lib/Jmol-12.1.13.jar
- file.reference.JmolApplet-12.1.13.jar=appletlib/JmolApplet-12.1.13.jar
+ file.reference.Jmol-12.2.4.jar=lib/Jmol-12.2.4.jar
+ file.reference.JmolApplet-12.2.4.jar=appletlib/JmolApplet-12.2.4.jar
  file.reference.log4j-1.2.8.jar=lib/log4j-1.2.8.jar
  file.reference.mail.jar=lib/mail.jar
 -file.reference.min-jaba-client.jar=lib/min-jaba-client.jar
 +file.reference.min-jaba-client.jar=lib/min-jaba-client-2.0.jar
  file.reference.regex.jar=lib/regex.jar
  file.reference.saaj.jar=lib/saaj.jar
  file.reference.vamsas-client.jar=lib/vamsas-client.jar

diff --cc utils/InstallAnywhere/Jalview.iap_xml
Simple merge