use JDOM2 for xml
Merge branch 'jdom' into newspimreconstruction