Fixing Scala version in pom.xml
Sync'ing latest changes