Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Mon, 15 Aug 2016 13:54:19 +0000 (14:54 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Mon, 15 Aug 2016 13:54:19 +0000 (14:54 +0100)

Trivial merge