Moved settings out of version control
Merge branch 'dev'