- i18n
Revert "- i18n"

This reverts commit 658d1c1fbedf516086e46a3c2cc3595f0054b846.
- tests
- small fixtures
Merge commit '658d1c1fbedf516086e46a3c2cc3595f0054b846'
- fixed JAXB issues