Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Thu, 27 Oct 2016 14:24:27 +0000 (15:24 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Thu, 27 Oct 2016 14:24:27 +0000 (15:24 +0100)

Trivial merge