edit settings file
Merge branch '#config' into develop