{Scala Worksheet does not compile} #SCL-7402 fixed
SDK setting re-added to play2 and sbt module builders
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'