Update Build.scala
Merge branch 'dev'