merged gemfile from 3.2
add migrations