Merge branch 'develop' of https://source.jalview.org/git/jalview.git
authorkjvdheide <kjvanderheide@dundee.ac.uk>
Thu, 26 Oct 2017 20:36:34 +0000 (21:36 +0100)
committerkjvdheide <kjvanderheide@dundee.ac.uk>
Thu, 26 Oct 2017 20:36:34 +0000 (21:36 +0100)
commit1750fec5e3d2a9c626481fac2b7f20fb2812db48
tree478f3133651eef7143262e41439487e1ec850d75
parent124d522feb831e168bfd923b32e2003353f5275a
parent974da947198af90e41d8a1e6facec83265904652
Merge branch 'develop' of https://source.jalview.org/git/jalview.git
into kjvdh/features/PhylogenyViewer

Conflicts:
src/jalview/gui/TreePanel.java
src/jalview/gui/AlignFrame.java
src/jalview/io/FileLoader.java
src/jalview/javascript/JSFunctionExec.java