Updated .gitignore with os generated files
Merge branch 'master' into integration