Merge branch 'JAL-1177_prop_rnasecstr' into develop

Conflicts:
	src/jalview/schemes/ColourSchemeProperty.java

-- whitespace conflicts only

diff --cc src/jalview/datamodel/Sequence.java
Simple merge

diff --cc src/jalview/schemes/ColourSchemeProperty.java
index d608a80,c655fe2..91a4890
--- 1/src/jalview/schemes/ColourSchemeProperty.java
--- 2/src/jalview/schemes/ColourSchemeProperty.java
+++ b/src/jalview/schemes/ColourSchemeProperty.java
@@@ -502,12 -487,10 +502,9 @@@ public class ColourSchemePropert
        cs = new TCoffeeColourScheme(coll);
        break;
        
- 
-       
-     // case COVARIATION:
-     // cs = new CovariationColourScheme(annotation);
- 
+       // case COVARIATION:
+       // cs = new CovariationColourScheme(annotation);
 -
 -      // break;
 +    // break;
  
      case USER_DEFINED:
        Color[] col = new Color[24];