modified build script, plugins and some scripts
Merge remote-tracking branch 'origin/master'

Conflicts:
	publish.sbt