Merge branch 'kjvdh/features/PhylogenyViewer' of
authorkjvdheide <kjvanderheide@dundee.ac.uk>
Mon, 18 Dec 2017 18:04:15 +0000 (18:04 +0000)
committerkjvdheide <kjvanderheide@dundee.ac.uk>
Mon, 18 Dec 2017 18:04:15 +0000 (18:04 +0000)
https://source.jalview.org/git/jalview.git into
kjvdh/features/PhylogenyViewer


Trivial merge