Make latest migration more stable against error
update some gems after accidental downgrade
Merge branch 'develop' of github.com:sharetribe/sharetribe into develop