init
Merge branch 'master'
Added JAXB dependencies.