Merge remote-tracking branch 'origin/develop' into imp/JAL-2774
authorkiramt <k.mourao@dundee.ac.uk>
Tue, 31 Oct 2017 13:59:31 +0000 (13:59 +0000)
committerkiramt <k.mourao@dundee.ac.uk>
Tue, 31 Oct 2017 13:59:31 +0000 (13:59 +0000)
commitc78840385a5ac9dd6d16a37aa7b55cfaeb360456
tree08a86f7141820dc841ceccff9d2e983c8631db0c
parent53507580ea0d347514d4f5e092a4d3d815609b9e
parent0a253653ec4c4a607ba3029444b2790721361766
Merge remote-tracking branch 'origin/develop' into imp/JAL-2774

Conflicts:
src/jalview/gui/SeqCanvas.java
src/jalview/appletgui/AnnotationPanel.java
src/jalview/appletgui/ScalePanel.java
src/jalview/gui/AnnotationPanel.java
src/jalview/gui/ScalePanel.java
src/jalview/gui/SeqCanvas.java
src/jalview/viewmodel/ViewportRanges.java
test/jalview/viewmodel/ViewportRangesTest.java