Merge branch 'features/JAL-2177_update_jmol_to_14.6.4_2016.10.26' into develop

diff --cc THIRDPARTYLIBS
index 85aa587,38d5b93..e0be904
--- 1/THIRDPARTYLIBS
--- 2/THIRDPARTYLIBS
+++ b/THIRDPARTYLIBS
@@@ -6,14 -6,11 +6,14 @@@ A number of sources have also been adap
  
  ext.edu.ucsf.rbvi.strucviz2 includes sources originally developed by Scooter Morris and Nadezhda Doncheva for the Cytoscape StructureViz2 plugin. It is released under the Berkley license and we hereby acknowledge its original copyright is held by the UCSF Computer Graphics Laboratory
   and the software was developed with support by the NIH National Center for Research Resources, grant P41-RR01081. 
 + 
 + jalview.ext.android includes code taken from the Android Open Source Project (https://android.googlesource.com/platform/frameworks/base/+/master/core/java/android/util).
 + The Apache 2.0 Licence (http://www.apache.org/licenses/LICENSE-2.0) is acknowledged in the source code.
  
 -Licencing information for each library is given below:
 +Licensing information for each library is given below:
  
  JGoogleAnalytics_0.3.jar      APL 2.0 License - http://code.google.com/p/jgoogleanalytics/
- Jmol-14.2.14_2015.06.11.jar   GPL/LGPLv2 http://sourceforge.net/projects/jmol/files/
+ Jmol-14.6.4_2016.10.26.jar    GPL/LGPLv2 http://sourceforge.net/projects/jmol/files/
  VARNAv3-93.jar GPL licenced software by K�vin Darty, Alain Denise and Yann Ponty. http://varna.lri.fr
  activation.jar        
  apache-mime4j-0.6.jar

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

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

diff --cc src/jalview/ext/jmol/JalviewJmolBinding.java
Simple merge