Conflicts:
	resources/lang/Messages.properties
	src/jalview/analysis/AlignmentUtils.java
	src/jalview/analysis/scoremodels/SecondaryStructureDistanceModel.java
	src/jalview/ext/jmol/JalviewJmolBinding.java
	src/jalview/viewmodel/AlignmentViewport.java
	src/jalview/workers/SecondaryStructureConsensusThread.java
	test/jalview/project/Jalview2xmlTests.java