Updated .gitignore
Updated .gitignore
Merge remote-tracking branch 'origin/develop'