Do not commit database.yml
Fixed entity creation and editing