Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of

https://source.jalview.org/git/jalview.git into
Jalview-BH/JAL-3026-JAL-3063-JAXB

Conflicts:
	swingjs/SwingJS-site.zip
	swingjs/timestamp
	swingjs/ver/3.2.4/SwingJS-site.zip
	swingjs/ver/3.2.4/timestamp

diff --cc swingjs/SwingJS-site.zip
index 4e04670,cd73ff2..e69de29
Binary files differ

diff --cc swingjs/timestamp
index 3238936,f5785d8..0cd7c32
--- 1/swingjs/timestamp
--- 2/swingjs/timestamp
+++ b/swingjs/timestamp
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +20181111143118 
++=======
+ 20181111141107 
++>>>>>>> branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git/jalview.git

diff --cc swingjs/ver/3.2.4/SwingJS-site.zip
index 4e04670,cd73ff2..e69de29
Binary files differ

diff --cc swingjs/ver/3.2.4/timestamp
index 3238936,f5785d8..0cd7c32
--- 1/swingjs/ver/3.2.4/timestamp
--- 2/swingjs/ver/3.2.4/timestamp
+++ b/swingjs/ver/3.2.4/timestamp
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +20181111143118 
++=======
+ 20181111141107 
++>>>>>>> branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git/jalview.git