Update google shopping and mockbot integration
Merge gemfile.lock