added support for local settings
Merge branch 'master' of github.com:WoLpH/dinner