moved application.example.yml to applicatin.yml
merged upstream
finished upstream merge