Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Fri, 23 Sep 2016 15:22:13 +0000 (16:22 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Fri, 23 Sep 2016 15:22:13 +0000 (16:22 +0100)

Trivial merge