Merge branch 'develop' into features/JAL-653_JAL-1766_htslib_refseqsupport

author gmungoc <g.m.carstairs@dundee.ac.uk>

Mon, 1 Feb 2016 10:23:29 +0000 (10:23 +0000)

committer gmungoc <g.m.carstairs@dundee.ac.uk>

Mon, 1 Feb 2016 10:23:29 +0000 (10:23 +0000)
author gmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 1 Feb 2016 10:23:29 +0000 (10:23 +0000)
committer gmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 1 Feb 2016 10:23:29 +0000 (10:23 +0000)
diff --cc src/jalview/schemes/ResidueProperties.java
Simple merge
diff --cc src/jalview/structure/StructureSelectionManager.java
Simple merge
author	gmungoc <g.m.carstairs@dundee.ac.uk>
	Mon, 1 Feb 2016 10:23:29 +0000 (10:23 +0000)
committer	gmungoc <g.m.carstairs@dundee.ac.uk>
	Mon, 1 Feb 2016 10:23:29 +0000 (10:23 +0000)
		1	2
src/jalview/schemes/ResidueProperties.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/jalview/structure/StructureSelectionManager.java	patch \|	diff1 \|	diff2 \|	blob \| history