Merge branch 'master' into portforward/JAL-2675_2102b1to2103
authorJim Procter <jprocter@issues.jalview.org>
Tue, 5 Sep 2017 12:41:45 +0000 (13:41 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Tue, 5 Sep 2017 12:41:45 +0000 (13:41 +0100)
commitb5a209613f14ad6e75f43aa537a96484d847ce0a
tree3a6b24098d2e3bd3def9b634970f8c4c0126d547
parent0ca13d2d06bf5ee99eb7dc123ee7ffcea016f733
parentf08d99e0bba639e1a4930944b0c30552fd765748
Merge branch 'master' into portforward/JAL-2675_2102b1to2103
update and resolve conflicts after 2.10.2b1 release

 Conflicts:
src/jalview/gui/SeqCanvas.java
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/appletgui/SeqPanel.java
src/jalview/gui/AlignmentPanel.java
src/jalview/gui/PopupMenu.java
src/jalview/gui/SeqCanvas.java
src/jalview/gui/SeqPanel.java