Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorkiramt <k.mourao@dundee.ac.uk>
Mon, 24 Oct 2016 17:29:46 +0000 (18:29 +0100)
committerkiramt <k.mourao@dundee.ac.uk>
Mon, 24 Oct 2016 17:29:46 +0000 (18:29 +0100)

Trivial merge