Begin Scala integration and physics update

merge with master