Removed settings.json
Merged local changes from Efforia