DEP-29
DEP-38 changed columns and jaxb parsing
Merge pull request #7 from maciejborkowski/dev

DEP-29 DEP-38