Remove settings.js
Merge branch 'develop'