loca_settings file ignored
ignoring local_settings file
Merge branch 'dev'