Fixed settings_local import
Merge branch 'master' of https://github.com/epolner/deliveryze