first commit
modified build script
Merge remote-tracking branch 'teamscala/master'

Conflicts:
	build.sbt
	publish.sbt