Merge branch 'release' into develop
Update gitignore
Fix .gitignore conflict