Merge branch 'feature/jaxbfx' into develop
Merge branch 'develop' of https://github.com/magomar/EstabEditor into develop