Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Wed, 26 Oct 2016 10:37:03 +0000 (11:37 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Wed, 26 Oct 2016 10:37:03 +0000 (11:37 +0100)

Trivial merge