added IntelliJ Idea files to .gitignore
Merge remote-tracking branch 'remotes/origin/dev'