Merge branch 'develop' into trialMerge

Conflicts:
	src/jalview/gui/CutAndPasteTransfer.java
	test/MCview/PDBfileTest.java
	test/jalview/analysis/AlignmentAnnotationUtilsTest.java
	test/jalview/analysis/DnaTest.java
	test/jalview/analysis/FinderTest.java
	test/jalview/analysis/scoremodels/FeatureScoreModelTest.java
	test/jalview/controller/AlignViewControllerTest.java
	test/jalview/datamodel/AlignmentTest.java
	test/jalview/ext/ensembl/EnsemblSeqProxyTest.java
	test/jalview/ext/jmol/JmolParserTest.java
	test/jalview/ext/jmol/JmolVsJalviewPDBParserEndToEndTest.java
	test/jalview/ext/paradise/TestAnnotate3D.java
	test/jalview/io/gff/ExonerateHelperTest.java
	test/jalview/io/gff/GffTests.java
	test/jalview/structure/Mapping.java
	test/jalview/structure/StructureSelectionManagerTest.java
	test/jalview/structures/models/AAStructureBindingModelTest.java
	test/jalview/util/MappingUtilsTest.java
	test/jalview/ws/sifts/SiftsClientTest.java