- global config changes
Merge branch 'master' of github.com:denisarius/petromarkers
- config changes