Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorkiramt <k.mourao@dundee.ac.uk>
Wed, 10 May 2017 13:29:07 +0000 (14:29 +0100)
committerkiramt <k.mourao@dundee.ac.uk>
Wed, 10 May 2017 13:29:07 +0000 (14:29 +0100)

Trivial merge