Merge "added generated files to .gitignore"