Merge branch 'master' into 'master'

Master

See merge request DM/dm!10

src/java/DmBase/nbproject/project.properties

@@ -33,12 +33,14 @@ file.reference.gson-2.3.1.jar=../lib/gson-2.3.1.jar
 file.reference.log4j-1.2.17.jar=../lib/log4j-1.2.17.jar
 file.reference.primefaces-6.0.jar=../lib/primefaces-6.0.jar
 file.reference.jaxb-osgi.jar=/local/DataManagement/support/opt/payara/glassfish/modules/jaxb-osgi.jar
+file.reference.jaxb-api-2.3.1.jar=../lib/jaxb-api-2.3.1.jar
 includes=**
 jar.compress=false
 javac.classpath=\
     ${file.reference.log4j-1.2.17.jar}:\
     ${file.reference.gson-2.3.1.jar}:\
     ${file.reference.primefaces-6.0.jar}:\
+    ${file.reference.jaxb-api-2.3.1.jar}:\
     ${file.reference.jaxb-osgi.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=