Updated settings_local example
Merge branch 'develop' into bootstrap