Clustering output
Merge remote-tracking branch 'origin/master' into mvn-repo

Conflicts:
	pom.xml