updating conf.yml.example
Merge branch 'develop'