Moved to scala 2.10.2, updated dependencies
Merge branch 'feature-scala-2.10'