GALAXY-915 - Merged 915 cobweb with master, updated the Gemfile.lock