Update gitignore
Merge branch 'develop' into remote