add "pg" gem
move sqlite3 gem to development env
fix conflict on gemfile lock
fix conflict