Merge remote-tracking branch

'origin/features/JAL-2388hiddencolumnschanges' into
features/JAL-2388OverviewWindow

Conflicts:
	resources/lang/Messages.properties

diff --cc resources/lang/Messages.properties
index 6b6577f,e63752d..91295e8
--- 1/resources/lang/Messages.properties
--- 2/resources/lang/Messages.properties
+++ b/resources/lang/Messages.properties
@@@ -1297,4 -1302,9 +1302,10 @@@ warn.name_cannot_be_duplicate = User-de
  label.invalid_name = Invalid Name !
  label.output_seq_details = Output Sequence Details to list all database references
  label.urllinks = Links
- label.togglehidden = Toggle hidden regions on/off
++label.togglehidden = Toggle hidden regions on/off
+ label.quality_descr = Alignment Quality based on Blosum62 scores
+ label.conservation_descr = Conservation of total alignment less than {0}% gaps
+ label.consensus_descr = PID
+ label.complement_consensus_descr = PID for cDNA
+ label.strucconsensus_descr = PID for base pairs
 -label.occupancy_descr = Number of aligned positions 
++label.occupancy_descr = Number of aligned positions 

diff --cc resources/lang/Messages_es.properties
Simple merge

diff --cc src/jalview/appletgui/AlignFrame.java
Simple merge

diff --cc src/jalview/appletgui/AlignViewport.java
Simple merge

diff --cc src/jalview/appletgui/AnnotationColumnChooser.java
Simple merge

diff --cc src/jalview/appletgui/SeqPanel.java
Simple merge

diff --cc src/jalview/gui/AlignFrame.java
Simple merge

diff --cc src/jalview/gui/AlignViewport.java
Simple merge

diff --cc src/jalview/gui/AnnotationColumnChooser.java
Simple merge

diff --cc src/jalview/gui/Jalview2XML.java
Simple merge

diff --cc src/jalview/gui/SeqPanel.java
Simple merge

diff --cc src/jalview/io/AnnotationFile.java
Simple merge

diff --cc src/jalview/io/JSONFile.java
Simple merge

diff --cc src/jalview/viewmodel/AlignmentViewport.java
Simple merge

diff --cc test/jalview/io/JSONFileTest.java
Simple merge