update .gitignore
Merged from origin/develop
Merged from origin/develop