Merge "Add IntelliJ IDEA related files to gitignore"