Merge branch 'develop' into improvement/JAL-3449_add_install4j_installer_getdown_vers...

diff --cc build.gradle
index 9dae53a,427d4a3..36b75fd
--- 1/build.gradle
--- 2/build.gradle
+++ b/build.gradle
@@@ -1439,18 -1244,20 +1453,21 @@@ task sourceDist(type: Tar) 
      exclude (getdown_website_dir)
  
      // exluding these as not using jars as modules yet
-     exclude ("${j11modDir}/**/*.jar")
-   }
-   //  from (jalviewDir) {
-   //    // explicit includes for stuff that seemed to not get included
-   //    include(fileTree("test/**/*."))
-   //    exclude(EXCLUDE_FILES)
-   //    exclude(PROCESS_FILES)
-   //  }
+     exclude ("$j11modDir/**/*.jar")
+   }
+   from(jalviewDir) {
+     include(INCLUDE_FILES)
+   }
+ //  from (jalviewDir) {
+ //    // explicit includes for stuff that seemed to not get included
+ //    include(fileTree("test/**/*."))
+ //    exclude(EXCLUDE_FILES)
+ //    exclude(PROCESS_FILES)
+ //  }
  }
  
 -task helppages  {
 +
 +task helppages {
    dependsOn copyHelp
    dependsOn pubhtmlhelp