edit config
Merge branch 'trunk' of https://github.com/SergeySukhanov/zeroProject into trunk