update to 4.0

Conflicts:
	pom.xml