Merge branch 'develop' of https://source.jalview.org/git/jalview into develop
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Wed, 1 Jun 2016 15:34:00 +0000 (16:34 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Wed, 1 Jun 2016 15:34:00 +0000 (16:34 +0100)
merge

1  2 
src/jalview/gui/AlignFrame.java

Simple merge