Merge branch 'develop' of http://source.jalview.org/git/jalview into develop

diff --combined build.gradle
index 383e189,0f0b8ff..492d7c1
--- 1/build.gradle
--- 2/build.gradle
+++ b/build.gradle
@@@ -638,7 -638,7 +638,7 @@@ task copyHelp(type: Copy) 
      exclude '**/*.gif'
        exclude '**/*.jpg'
        exclude '**/*.png'
 -      filter(ReplaceTokens, beginToken: '$$', endToken: '$$', tokens: ['Version-Rel': JALVIEW_VERSION])
 +      filter(ReplaceTokens, beginToken: '$$', endToken: '$$', tokens: ['Version-Rel': JALVIEW_VERSION,'Year-Rel': getDate("yyyy")])
    }
    from(inputDir) {
      include '**/*.gif'
@@@ -1170,7 -1170,13 +1170,13 @@@ clean 
  task sourceDist (type: Tar) {
    
    def VERSION_UNDERSCORES = JALVIEW_VERSION.replaceAll("\\.", "_")
-   archiveFileName = project.name + "_" + VERSION_UNDERSCORES + ".tar.gz"
+   def outputFileName = project.name + "_" + VERSION_UNDERSCORES + ".tar.gz"
+   // cater for buildship < 3.1 [3.0.1 is max version in eclipse 2018-09]
+   try {
+     archiveFileName = outputFileName
+   } catch (Exception e) {
+     archiveName = outputFileName
+   }
    
    compression Compression.GZIP
    
@@@ -1232,5 -1238,5 +1238,5 @@@ task helppages  
    dependsOn pubhtmlhelp
    
    inputs.dir("$classes/$helpDir")
 -  outputs.file("build/distribution/help/helpTOC.html")
 +  outputs.dir("$helpOutputDir")
  }