Update pom

Conflicts:
	pom.xml