Исправлено конфиги
Merge branch 'master' into develop