Adjust .gitignore for IDEA generated files and folders
Merge remote-tracking branch 'origin/master'