Merge branch 'debug' of https://source.jalview.org/git/jalviewjs.git into debug
authorhansonr <hansonr@stolaf.edu>
Fri, 24 Jul 2015 11:32:38 +0000 (12:32 +0100)
committerhansonr <hansonr@stolaf.edu>
Fri, 24 Jul 2015 11:32:38 +0000 (12:32 +0100)

Trivial merge