Update dependencies

Conflicts:
	pom.xml