Upgrade sbt
删除重复配置
Merge branch 'master' of https://github.com/qifun/json-stream

Conflicts:
	build.sbt