Updating some dependencies

Conflicts:
	pom.xml