Merge branch 'master' of https://source.jalview.org/git/jalviewjs.git2015-07-24T12:13:26Zhansonrhansonr@stolaf.eduhansonrhansonr@stolaf.edu2015-07-24T12:13:26Zhttp://source.jalview.org/gitweb/?p=jalviewjs.git;a=commitdiff;h=b9b7a352eee79b7764c3b09c9d19663075061d8c
Merge branch 'master' of https://source.jalview.org/git/jalviewjs.git
Conflicts:
src/fr/orsay/lri/varna/models/rna/RNA.java
JAL-1807 includes ?j2sdebug flag and DebugJS._(msg)2015-07-24T09:27:35Zhansonrhansonr@stolaf.eduhansonrhansonr@stolaf.edu2015-07-24T09:27:35Zhttp://source.jalview.org/gitweb/?p=jalviewjs.git;a=commitdiff;h=7301a2415adab88038b291fc54caeeb3a5a47a44
JAL-1807 includes ?j2sdebug flag and DebugJS._(msg)