1. resolve jaxb conflict
Merge branch 'master' of github.com:ostdlabs/smsc-test-server