Updated dependencies to newest versions
Cleanup
Merge remote-tracking branch 'upstream/master'

Conflicts:
	project/Build.scala