Merge branch 'develop' into features/JAL-1793VCF

diff --combined resources/lang/Messages.properties
index f5154f1,5d9bdff..7295104
--- 1/resources/lang/Messages.properties
--- 2/resources/lang/Messages.properties
+++ b/resources/lang/Messages.properties
@@@ -490,8 -490,6 +490,8 @@@ label.settings_for_type = Settings for 
  label.view_full_application = View in Full Application
  label.load_associated_tree = Load Associated Tree...
  label.load_features_annotations = Load Features/Annotations...
 +label.load_vcf = Load SNP variants from plain text or indexed VCF data
 +label.load_vcf_file = Load VCF File
  label.export_features = Export Features...
  label.export_annotations = Export Annotations...
  label.to_upper_case = To Upper Case
@@@ -1297,7 -1295,6 +1297,6 @@@ label.database = Databas
  label.urltooltip = Only one url, which must use a sequence id, can be selected for the 'On Click' option
  label.edit_sequence_url_link = Edit sequence URL link
  warn.name_cannot_be_duplicate = User-defined URL names must be unique and cannot be MIRIAM ids
- label.invalid_name = Invalid Name !
  label.output_seq_details = Output Sequence Details to list all database references
  label.urllinks = Links
  label.default_cache_size = Default Cache Size