Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Mon, 1 May 2017 17:16:56 +0000 (18:16 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Mon, 1 May 2017 17:16:56 +0000 (18:16 +0100)

Trivial merge