Merge "Add .idea to .gitignore"