add travis ci test database
fixed gemfile merge conflicts