Update libraries
Conflicts:
	pom.xml