Update Scala version.
Update .gitignore
Merge branch 'dev'