dependency version update
Merge remote-tracking branch 'origin/dependency-update' into dependency-update

Conflicts:
	pom.xml