Merge "Add *.iml to .gitignore"