Improving distribution management to avoid to write pom twice
Merge remote-tracking branch 'origin/master'

Conflicts:
	build.sbt
	pom.xml