Fixed an issue with jaxb version not findable on different machine
Merge branch 'master' into version_upgrade

Conflicts:
	pom.xml