Update gitignore
Update content
Merge branch 'release' into develop
Update gitignore