Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
authorkiramt <k.mourao@dundee.ac.uk>
Thu, 23 Mar 2017 20:40:10 +0000 (20:40 +0000)
committerkiramt <k.mourao@dundee.ac.uk>
Thu, 23 Mar 2017 20:40:10 +0000 (20:40 +0000)

Trivial merge