Add application.yml example
Merge branch 'dev'