Merge master to sbt server