Add IDEA project files
Remove sbt-idea usage
Update .iml
Merge branch 'master' into idea