init
Merge remote-tracking branch 'teamscala/master'

Conflicts:
	publish.sbt