Remove application.yml
Merge branch 'develop'