updated settings and gitignore
Merge branch 'develop'