Merge remote-tracking branch 'origin/develop' into
authorkiramt <k.mourao@dundee.ac.uk>
Wed, 19 Apr 2017 11:01:30 +0000 (12:01 +0100)
committerkiramt <k.mourao@dundee.ac.uk>
Wed, 19 Apr 2017 11:01:30 +0000 (12:01 +0100)
commit484abc22be60686d5188c8ff1b90613e821ea946
treee6cfa1be1a8bff7b9e9f18a0a244e4eab2873268
parent2feac6dabe64b144783f8538fab352e987eadcb6
parent242fe71de915d94d6f73d790bb14e377bb9624d3
Merge remote-tracking branch 'origin/develop' into
features/JAL-2388OverviewWindow

Conflicts:
resources/lang/Messages_es.properties
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/viewmodel/AlignmentViewport.java