added line in dev
added line in conf
Merge branch 'conf' into develop
dsadada