Merge branch 'develop'
Update .gitignore
Delete .gitignore