fix database.yml
fix type of fields
gemfile fix