Upgrade libraries

Conflicts:
	pom.xml