renamed settings default file to fix deployment overwriting
Merge branch 'develop'