removed db yml, because auto generation
Merge remote-tracking branch 'origin/master'