Merge branch 'Jalview-JS/develop' of https://source.jalview.org/git/jalview.git into...
authorhansonr <hansonr@STO24954W.ad.stolaf.edu>
Mon, 1 Apr 2019 02:38:34 +0000 (21:38 -0500)
committerhansonr <hansonr@STO24954W.ad.stolaf.edu>
Mon, 1 Apr 2019 02:38:34 +0000 (21:38 -0500)

Trivial merge