Add scala code to mainline
Merge pull request #135 from aljoscha/add-scala-frontend

Add scala code to mainline
Adapted CombineTask tests to new local strategy
Merge branch 'master' of https://github.com/dimalabs/ozone