Add IDEA project files
Scala and library upgrades
resolve conflict 2
gitignore file