Refresh commit
Merge github.com:yoosee/local_settings