fix build.sbt bug
Merge branch '20130420'