Update gitignore file
Merge branch 'hotfix-gitignore' into develop