Upgrade to latest version of Scala and sbt. Ensure .sbt/tmp dir is exist before launching sbt
fix doc
Fix doc
fix merge