Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
commited
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/test/scala/PublishSpecs.scala
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
some changes for build.sbt
publish to sonatype is working now.