Bumping to depend on 1.7.0-SNAPSHOT
Merge branch 'master' into 1.7.0

Resolved conflicts:
	dom/pom.xml
	pom.xml