From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Thu, 17 Jan 2019 15:29:29 +0000 (+0000)
Subject: Merge branch 'develop' into Jalview-BH/JAL-3026-JAL-3063-JAXB
X-Git-Tag: Develop-2_11_2_0-d20201215~24^2~68^2~315
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=4c132b37c867a60959dae032addd78892d996345;hp=4c132b37c867a60959dae032addd78892d996345;p=jalview.git

Merge branch 'develop' into Jalview-BH/JAL-3026-JAL-3063-JAXB

Conflicts:
	.gitignore
	resources/lang/Messages.properties
	resources/lang/Messages_es.properties
	src/jalview/commands/EditCommand.java
	src/jalview/gui/FeatureSettings.java
	src/jalview/gui/ScalePanel.java
---