Remove settings
Update gitignore
Merge remote-tracking branch 'origin/develop' into develop