updated dependencies
Merge remote-tracking branch 'origin/dependency-updates'

Conflicts:
	pom.xml