diff --git a/.env b/.env
new file mode 100644
index 000000000..835643428
--- /dev/null
+++ b/.env
@@ -0,0 +1,19 @@
+RAILS_ENV=development
+RACK_ENV=development
+
+JAM_RUBY_VERSION=2.4.1
+
+POSTGRES_DB=jam
+POSTGRES_USER=postgres
+POSTGRES_PASSWORD=postgres
+POSTGRES_HOST=database
+
+AWS_KEY=AKIA2SXEHOQFJIDPXEUG
+AWS_SECRET=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
+
+RABBITMQ_HOST=rabbitmq
+RABBITMQ_PORT=5672
+
+BUNDLE_PATH=/bundle/vendor
+#GEM_PATH=/bundle/vendor
+#GEM_HOME=/bundle/vendor
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 2773be5d3..e82e8f786 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ working.png
 ruby/.rails5-gems
 web/.rails5-gems
 websocket-gateway/.rails5-gems
+.pg_data/
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 000000000..230214196
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,78 @@
+FROM ubuntu:18.04
+
+#ARG DEBIAN_FRONTEND=noninteractive
+
+# Install essential Linux packages
+RUN apt-get update -qq && apt-get install -y build-essential git curl  wget g++ libreadline6-dev libreadline-dev zlib1g-dev libssl-dev libyaml-dev libsqlite3-dev sqlite3 autoconf libgdbm-dev libncurses5-dev automake libtool bison pkg-config libffi-dev liblzma-dev zlib1g-dev libgmp-dev libgmp3-dev libpq-dev postgresql-client openssl libxml2-dev libxslt-dev nodejs protobuf-compiler protobuf-c-compiler shared-mime-info
+    
+#Install nodejs
+# RUN curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash -
+# RUN apt-get install -y nodejs
+
+#Install ruby 
+RUN wget -O ruby-install-0.8.3.tar.gz https://github.com/postmodern/ruby-install/archive/v0.8.3.tar.gz \
+&& tar -xzvf ruby-install-0.8.3.tar.gz \
+&& cd ruby-install-0.8.3/ \
+&& make install
+
+RUN ruby-install --system ruby 2.4.1
+
+# installs a old version of protocol buffers.  hard to build these days.
+RUN curl https://jamjam:blueberryjam@int.jamkazam.com/stuff/protobuf-2.4.1.tgz -o /tmp/protobuf-2.4.1.tgz && \
+    cd /tmp && \
+    tar -xvzf protobuf-2.4.1.tgz && \
+    cp protobuf-2.4.1/usr/lib/* /usr/lib/ && \
+    cp protobuf-2.4.1/usr/bin/protoc /usr/bin/protoc
+
+#setup app
+ARG RAILS_ENV
+ARG RACK_ENV
+ARG BUNDLER_VERSION
+ARG AWS_KEY
+ARG AWS_SECRET
+ARG POSTGRES_USER
+ARG POSTGRES_PASSWORD
+ARG POSTGRES_DB
+ARG INIT_BUILD
+ARG LOCAL_DEV
+
+#ARG GEM_PATH
+#ARG GEM_HOME
+
+ENV RAILS_ENV $RAILS_ENV
+ENV RACK_ENV $RACK_ENV
+ENV BUNDLER_VERSION $BUNDLER_VERSION
+ENV POSTGRES_USER $POSTGRES_USER
+ENV POSTGRES_PASSWORD $POSTGRES_PASSWORD
+ENV POSTGRES_DB $POSTGRES_DB
+ENV AWS_KEY ${AWS_SECRET}
+ENV AWS_SECRET ${AWS_SECRET}
+ENV INIT_BUILD ${INIT_BUILD}
+ENV LOCAL_DEV ${LOCAL_DEV}
+
+#ENV GEM_PATH ${GEM_PATH}
+#ENV GEM_HOME ${GEM_HOME}
+
+
+ENV APP_ROOT /app
+
+# install our old version of bundler
+RUN gem install bundler -v '1.17.3'
+
+# get a latest bundler installed too
+RUN gem install bundler -v '2.1.4'  
+# Set our working directory inside the image
+WORKDIR $APP_ROOT
+
+# Copy the application into place
+COPY . ./
+
+# Set bundle config
+RUN bundle config build.nokogiri --use-system-libraries
+RUN bundle config int.jamkazam.com jamjam:blueberryjam
+
+RUN echo 'export AWS_KEY="${AWS_KEY}"' >> ~/.bashrc
+RUN echo 'export AWS_SECRET="${AWS_SECRET}"' >> ~/.bashrc
+
+#ENTRYPOINT ["./entrypoint.sh"]
+CMD [ "./setup.sh" ]
\ No newline at end of file
diff --git a/Dockerfile.pg b/Dockerfile.pg
new file mode 100644
index 000000000..d15187721
--- /dev/null
+++ b/Dockerfile.pg
@@ -0,0 +1,5 @@
+#FROM postgres:9.4
+FROM postgres:12
+#COPY db/setup.sh /docker-entrypoint-initdb.d/
+EXPOSE 5432
+CMD ["postgres"]
\ No newline at end of file
diff --git a/admin/config/application.rb b/admin/config/application.rb
index 73e9717e7..cb8783fff 100644
--- a/admin/config/application.rb
+++ b/admin/config/application.rb
@@ -93,8 +93,8 @@ module JamAdmin
 
 
     # where is rabbitmq?
-    config.rabbitmq_host = "127.0.0.1"
-    config.rabbitmq_port = 5672
+    config.rabbitmq_host = ENV['RABBITMQ_HOST'] || "127.0.0.1"
+    config.rabbitmq_port = ENV['RABBITMQ_PORT'] ||  5672
 
     # set to false to instead use amazon. You will also need to supply amazon secrets
     config.store_artifacts_to_disk = false
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 000000000..76671df43
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,75 @@
+version: '3.4'
+
+services:
+  database:
+    build:
+      context: .
+      dockerfile: Dockerfile.pg
+    volumes:
+      #- ./db/setup.sh:/docker-entrypoint-initdb.d/initdb.sh
+      - ./.pg_data:/var/lib/postgresql/data
+    ports:
+      - "5432:5432"
+    env_file: .env
+    restart: unless-stopped
+    networks:
+      - jamkazam-network
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready"]
+      interval: 30s
+      timeout: 60s
+      retries: 5
+      start_period: 80s  
+    
+  app:
+    platform: linux/amd64
+    build:
+      context: .
+      dockerfile: Dockerfile
+      # args:
+      #   INIT_BUILD: 1
+    depends_on:
+      - database
+      - rabbitmq
+    volumes:
+      - .:/app
+      - bundle_path:/bundle
+    env_file: .env
+    environment:
+      RABBITMQ_HOST: rabbitmq
+    restart: always
+    ports:
+      - "3000:3000"
+      - "6767:6767"
+    networks:
+      - jamkazam-network
+
+  redis:
+    image: redis:4.0
+    ports: 
+      - "6379"
+    networks:
+      - jamkazam-network
+
+  rabbitmq:
+    image: rabbitmq
+    expose:
+      - 5672
+      - 15672
+    ports:
+      - 5672:5672
+      - 15672:15672
+    networks:
+      - jamkazam-network
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:15672"]
+      interval: 30s
+      timeout: 10s
+      retries: 5
+
+networks:
+  jamkazam-network:
+    driver: bridge           
+
+volumes:
+  bundle_path:
\ No newline at end of file
diff --git a/mimemagic-0.3.5.gem b/mimemagic-0.3.5.gem
new file mode 100644
index 000000000..34c9cd99b
Binary files /dev/null and b/mimemagic-0.3.5.gem differ
diff --git a/pb/Gemfile.lock b/pb/Gemfile.lock
index 2c1f6f007..7430d62de 100644
--- a/pb/Gemfile.lock
+++ b/pb/Gemfile.lock
@@ -13,4 +13,4 @@ RUBY VERSION
    ruby 2.4.1p111
 
 BUNDLED WITH
-   1.17.3
+   2.3.16
diff --git a/ruby/lib/jam_ruby/lib/em_helper.rb b/ruby/lib/jam_ruby/lib/em_helper.rb
index 5867424ef..8b280a628 100644
--- a/ruby/lib/jam_ruby/lib/em_helper.rb
+++ b/ruby/lib/jam_ruby/lib/em_helper.rb
@@ -41,7 +41,6 @@ module JamWebEventMachine
 
 
   def self.run_em(calling_thread = nil, semaphore = nil, ran = {})
-
     semaphore.lock if semaphore
     EM.run do
       # this is global because we need to check elsewhere if we are currently connected to amqp before signalling success with some APIs, such as 'create session'
diff --git a/ruby/spec/support/utilities.rb b/ruby/spec/support/utilities.rb
index a0703f8e6..ed7e1bd6a 100644
--- a/ruby/spec/support/utilities.rb
+++ b/ruby/spec/support/utilities.rb
@@ -134,11 +134,11 @@ def app_config
     end
 
     def rabbitmq_host
-      "localhost"
+      ENV['RABBITMQ_HOST'] || "localhost"
     end
 
     def rabbitmq_port
-      5672
+      ENV['RABBITMQ_PORT'] || 5672
     end
 
     def external_hostname
diff --git a/setup.sh b/setup.sh
new file mode 100755
index 000000000..0e1aa570a
--- /dev/null
+++ b/setup.sh
@@ -0,0 +1,37 @@
+#!/bin/bash -x
+
+if [[ "$INIT_BUILD" == 1 ]] 
+then
+  echo "****copy mimemagic gem to bundle/vender/gems"
+  mkdir -p /bundle/vendor/gems
+  cp /app/mimemagic-0.3.5.gem /bundle/vendor/gems
+
+  echo "*****setup pb"
+  cd /app/pb && BUNDLER_VERSION='2.1.4' JAM_RUBY_VERSION='2.4.1' ./build
+
+  echo "*****bundling ruby gems"
+  cd /app/ruby && JAM_RUBY_VERSION='2.4.1' bundle _1.17.3_ install
+
+  echo "*****bundling websocket gems"
+  cd /app/websocket-gateway && JAM_RUBY_VERSION='2.4.1' bundle _1.17.3_ install
+
+  echo "*****bundling web gems"
+  cd /app/web && JAM_RUBY_VERSION='2.4.1' bundle _1.17.3_ install
+
+  echo "*****running db migrations"
+  cd /app/web && JAM_RUBY_VERSION='2.4.1' bundle _1.17.3_ exec rake db:jam_ruby:migrate 
+pwd
+fi
+
+# echo "*****start running websocket-gateway"
+# cd /app/websocket-gateway && JAM_RUBY_VERSION='2.4.1' bundle _1.17.3_ exec ruby -Ilib bin/websocket_gateway
+
+echo "*****start running rails server"
+cd /app/web && JAM_RUBY_VERSION='2.4.1' bundle _1.17.3_ exec rails s -b 0.0.0.0
+
+
+# while :
+# do
+# 	echo "Press [CTRL+C] to stop.."
+# 	sleep 1
+# done
\ No newline at end of file
diff --git a/web/Gemfile b/web/Gemfile
index d58012c38..77ef7c29c 100644
--- a/web/Gemfile
+++ b/web/Gemfile
@@ -249,3 +249,7 @@ end
 group :package do
    gem 'fpm'
 end
+
+#gem 'mimemagic', '~> 0.3.10'
+gem 'mimemagic', '~> 0.3.5'
+gem 'tzinfo-data'
\ No newline at end of file
diff --git a/web/Gemfile-bk.lock b/web/Gemfile-bk.lock
new file mode 100644
index 000000000..1a150ba57
--- /dev/null
+++ b/web/Gemfile-bk.lock
@@ -0,0 +1,937 @@
+PATH
+  remote: ../pb/target/ruby/jampb
+  specs:
+    jampb (0.1.1)
+
+PATH
+  remote: ../ruby
+  specs:
+    jam_ruby (0.1.1)
+
+PATH
+  remote: ../websocket-gateway
+  specs:
+    jam_websockets (0.1.1)
+
+GEM
+  remote: http://rubygems.org/
+  remote: https://rails-assets.org/
+  specs:
+    CFPropertyList (2.3.6)
+    aasm (5.1.1)
+      concurrent-ruby (~> 1.0)
+    actionmailer (4.2.8)
+      actionpack (= 4.2.8)
+      actionview (= 4.2.8)
+      activejob (= 4.2.8)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.8)
+      actionview (= 4.2.8)
+      activesupport (= 4.2.8)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.8)
+      activesupport (= 4.2.8)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (4.2.8)
+      activesupport (= 4.2.8)
+      globalid (>= 0.3.0)
+    activemodel (4.2.8)
+      activesupport (= 4.2.8)
+      builder (~> 3.1)
+    activerecord (4.2.8)
+      activemodel (= 4.2.8)
+      activesupport (= 4.2.8)
+      arel (~> 6.0)
+    activerecord-import (0.4.1)
+      activerecord (>= 3.0)
+    activesupport (4.2.8)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    aes_key_wrap (1.1.0)
+    aliyun-sdk (0.8.0)
+      nokogiri (~> 1.6)
+      rest-client (~> 2.0)
+    amq-client (0.9.12)
+      amq-protocol (>= 1.2.0)
+      eventmachine
+    amq-protocol (2.3.2)
+    amqp (0.9.8)
+      amq-client (~> 0.9.5)
+      amq-protocol (>= 0.9.4)
+      eventmachine
+    arel (6.0.4)
+    arr-pm (0.0.10)
+      cabin (> 0)
+    attr_required (1.0.1)
+    auto_strip_attributes (2.6.0)
+      activerecord (>= 4.0)
+    autoparse (0.3.3)
+      addressable (>= 2.3.1)
+      extlib (>= 0.9.15)
+      multi_json (>= 1.0.0)
+    aws-sdk (1.67.0)
+      aws-sdk-v1 (= 1.67.0)
+    aws-sdk-v1 (1.67.0)
+      json (~> 1.4)
+      nokogiri (~> 1)
+    babel-source (5.8.35)
+    babel-transpiler (0.7.0)
+      babel-source (>= 4.0, < 6)
+      execjs (~> 2.0)
+    backports (3.20.2)
+    bcrypt (3.1.13)
+    bindata (2.4.8)
+    bootstrap-will_paginate (0.0.6)
+      will_paginate
+    bower-rails (0.9.2)
+    buftok (0.2.0)
+    bugsnag (5.3.2)
+    builder (3.2.4)
+    byebug (11.0.1)
+    cabin (0.9.0)
+    capybara (3.15.1)
+      addressable
+      mini_mime (>= 0.1.3)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      regexp_parser (~> 1.2)
+      xpath (~> 3.2)
+    capybara-screenshot (1.0.25)
+      capybara (>= 1.0, < 4)
+      launchy
+    carmen (1.1.3)
+      activesupport (>= 3.0.0)
+    carrierwave (0.11.2)
+      activemodel (>= 3.2.0)
+      activesupport (>= 3.2.0)
+      json (>= 1.7)
+      mime-types (>= 1.16)
+      mimemagic (>= 0.3.0)
+    carrierwave_direct (1.0.0)
+      carrierwave (~> 0.11)
+      fog-aws
+    cause (0.1)
+    childprocess (0.9.0)
+      ffi (~> 1.0, >= 1.0.11)
+    clamp (1.0.1)
+    coderay (1.1.3)
+    coffee-rails (4.2.2)
+      coffee-script (>= 2.2.0)
+      railties (>= 4.0.0)
+    coffee-script (2.4.1)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.12.2)
+    concurrent-ruby (1.1.8)
+    connection_pool (2.2.3)
+    crack (0.4.5)
+      rexml
+    crass (1.0.6)
+    database_cleaner (1.3.0)
+    devise (3.3.0)
+      bcrypt (~> 3.0)
+      orm_adapter (~> 0.1)
+      railties (>= 3.2.6, < 5)
+      thread_safe (~> 0.1)
+      warden (~> 1.2.3)
+    diff-lcs (1.4.4)
+    domain_name (0.5.20190701)
+      unf (>= 0.0.5, < 1.0.0)
+    dotenv (2.7.6)
+    elasticsearch (7.4.0)
+      elasticsearch-api (= 7.4.0)
+      elasticsearch-transport (= 7.4.0)
+    elasticsearch-api (7.4.0)
+      multi_json
+    elasticsearch-transport (7.4.0)
+      faraday
+      multi_json
+    em-websocket (0.5.2)
+      eventmachine (>= 0.12.9)
+      http_parser.rb (~> 0.6.0)
+    email_validator (1.6.0)
+      activemodel
+    equalizer (0.0.11)
+    erubis (2.7.0)
+    et-orbi (1.2.4)
+      tzinfo
+    eventmachine (1.2.3)
+    excon (0.79.0)
+    execjs (2.6.0)
+    extlib (0.9.16)
+    factory_girl (4.9.0)
+      activesupport (>= 3.0.0)
+    factory_girl_rails (4.9.0)
+      factory_girl (~> 4.9.0)
+      railties (>= 3.0.0)
+    faker (1.3.0)
+      i18n (~> 0.5)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    fb_graph (2.5.9)
+      httpclient (>= 2.2.0.2)
+      json
+      rack-oauth2 (>= 0.14.4)
+      tzinfo
+    ffi (1.12.2)
+    ffi-compiler (1.0.1)
+      ffi (>= 1.0.0)
+      rake
+    filepicker-rails (0.1)
+      multi_json (~> 1.6)
+      railties (>= 3.1.0, < 5.0)
+    fission (0.5.0)
+      CFPropertyList (~> 2.2)
+    fog (1.41.0)
+      fog-aliyun (>= 0.1.0)
+      fog-atmos
+      fog-aws (>= 0.6.0)
+      fog-brightbox (~> 0.4)
+      fog-cloudatcost (~> 0.1.0)
+      fog-core (~> 1.45)
+      fog-digitalocean (>= 0.3.0)
+      fog-dnsimple (~> 1.0)
+      fog-dynect (~> 0.0.2)
+      fog-ecloud (~> 0.1)
+      fog-google (<= 0.1.0)
+      fog-internet-archive
+      fog-joyent
+      fog-json
+      fog-local
+      fog-openstack
+      fog-powerdns (>= 0.1.1)
+      fog-profitbricks
+      fog-rackspace
+      fog-radosgw (>= 0.0.2)
+      fog-riakcs
+      fog-sakuracloud (>= 0.0.4)
+      fog-serverlove
+      fog-softlayer
+      fog-storm_on_demand
+      fog-terremark
+      fog-vmfusion
+      fog-voxel
+      fog-vsphere (>= 0.4.0)
+      fog-xenserver
+      fog-xml (~> 0.1.1)
+      ipaddress (~> 0.5)
+      json (>= 1.8, < 2.0)
+    fog-aliyun (0.3.19)
+      aliyun-sdk (~> 0.8.0)
+      fog-core
+      fog-json
+      ipaddress (~> 0.8)
+      xml-simple (~> 1.1)
+    fog-atmos (0.1.0)
+      fog-core
+      fog-xml
+    fog-aws (2.0.1)
+      fog-core (~> 1.38)
+      fog-json (~> 1.0)
+      fog-xml (~> 0.1)
+      ipaddress (~> 0.8)
+    fog-brightbox (0.11.0)
+      fog-core (~> 1.22)
+      fog-json
+      inflecto (~> 0.0.2)
+    fog-cloudatcost (0.1.2)
+      fog-core (~> 1.36)
+      fog-json (~> 1.0)
+      fog-xml (~> 0.1)
+      ipaddress (~> 0.8)
+    fog-core (1.45.0)
+      builder
+      excon (~> 0.58)
+      formatador (~> 0.2)
+    fog-digitalocean (0.4.0)
+      fog-core
+      fog-json
+      fog-xml
+      ipaddress (>= 0.5)
+    fog-dnsimple (1.0.0)
+      fog-core (~> 1.38)
+      fog-json (~> 1.0)
+    fog-dynect (0.0.3)
+      fog-core
+      fog-json
+      fog-xml
+    fog-ecloud (0.3.0)
+      fog-core
+      fog-xml
+    fog-google (0.1.0)
+      fog-core
+      fog-json
+      fog-xml
+    fog-internet-archive (0.0.2)
+      fog-core
+      fog-json
+      fog-xml
+    fog-joyent (0.0.1)
+      fog-core (~> 1.42)
+      fog-json (>= 1.0)
+    fog-json (1.2.0)
+      fog-core
+      multi_json (~> 1.10)
+    fog-local (0.6.0)
+      fog-core (>= 1.27, < 3.0)
+    fog-openstack (0.3.10)
+      fog-core (>= 1.45, <= 2.1.0)
+      fog-json (>= 1.0)
+      ipaddress (>= 0.8)
+    fog-powerdns (0.2.0)
+      fog-core
+      fog-json
+      fog-xml
+    fog-profitbricks (4.1.1)
+      fog-core (~> 1.42)
+      fog-json (~> 1.0)
+    fog-rackspace (0.1.6)
+      fog-core (>= 1.35)
+      fog-json (>= 1.0)
+      fog-xml (>= 0.1)
+      ipaddress (>= 0.8)
+    fog-radosgw (0.0.5)
+      fog-core (>= 1.21.0)
+      fog-json
+      fog-xml (>= 0.0.1)
+    fog-riakcs (0.1.0)
+      fog-core
+      fog-json
+      fog-xml
+    fog-sakuracloud (1.7.5)
+      fog-core
+      fog-json
+    fog-serverlove (0.1.2)
+      fog-core
+      fog-json
+    fog-softlayer (1.1.4)
+      fog-core
+      fog-json
+    fog-storm_on_demand (0.1.1)
+      fog-core
+      fog-json
+    fog-terremark (0.1.0)
+      fog-core
+      fog-xml
+    fog-vmfusion (0.1.0)
+      fission
+      fog-core
+    fog-voxel (0.1.0)
+      fog-core
+      fog-xml
+    fog-vsphere (3.5.0)
+      fog-core
+      rbvmomi (>= 1.9, < 3)
+    fog-xenserver (1.0.0)
+      fog-core
+      fog-xml
+      xmlrpc
+    fog-xml (0.1.3)
+      fog-core
+      nokogiri (>= 1.5.11, < 2.0.0)
+    formatador (0.2.5)
+    fpm (1.12.0)
+      arr-pm (~> 0.0.10)
+      backports (>= 2.6.2)
+      cabin (>= 0.6.0)
+      childprocess (< 1.0.0)
+      clamp (~> 1.0.0)
+      ffi (~> 1.12.0)
+      git (>= 1.3.0, < 2.0)
+      json (>= 1.7.7, < 3.0)
+      pleaserun (~> 0.0.29)
+      ruby-xz (~> 0.2.3)
+      stud
+    fugit (1.4.2)
+      et-orbi (~> 1.1, >= 1.1.8)
+      raabro (~> 1.4)
+    geokit (1.13.1)
+    geokit-rails (2.3.2)
+      geokit (~> 1.5)
+      rails (>= 3.0)
+    git (1.8.1)
+      rchardet (~> 1.8)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
+    god (0.13.7)
+    gon (4.1.1)
+      actionpack (>= 2.3.0)
+      json
+    google-api-client (0.7.1)
+      addressable (>= 2.3.2)
+      autoparse (>= 0.3.3)
+      extlib (>= 0.9.15)
+      faraday (>= 0.9.0)
+      jwt (>= 0.1.5)
+      launchy (>= 2.1.1)
+      multi_json (>= 1.0.0)
+      retriable (>= 1.4)
+      signet (>= 0.5.0)
+      uuidtools (>= 2.1.0)
+    haml (4.0.7)
+      tilt
+    haml-rails (0.9.0)
+      actionpack (>= 4.0.1)
+      activesupport (>= 4.0.1)
+      haml (>= 4.0.6, < 5.0)
+      html2haml (>= 1.0.1)
+      railties (>= 4.0.1)
+    hashdiff (1.0.1)
+    hashie (4.1.0)
+    html2haml (2.2.0)
+      erubis (~> 2.7.0)
+      haml (>= 4.0, < 6)
+      nokogiri (>= 1.6.0)
+      ruby_parser (~> 3.5)
+    htmlentities (4.3.4)
+    http (4.4.1)
+      addressable (~> 2.3)
+      http-cookie (~> 1.0)
+      http-form_data (~> 2.2)
+      http-parser (~> 1.2.0)
+    http-accept (1.7.0)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
+    http-form_data (2.3.0)
+    http-parser (1.2.3)
+      ffi-compiler (>= 1.0, < 2.0)
+    http_parser.rb (0.6.0)
+    httparty (0.18.1)
+      mime-types (~> 3.0)
+      multi_xml (>= 0.5.2)
+    httpclient (2.8.3)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    icalendar (2.4.0)
+    inflecto (0.0.2)
+    influxdb (0.3.14)
+      cause
+      json
+    influxdb-rails (0.1.12)
+      influxdb (~> 0.3.0)
+      railties
+    insist (1.0.0)
+    io-like (0.3.1)
+    ipaddress (0.8.3)
+    iso-639 (0.3.5)
+    jquery-rails (4.4.0)
+      rails-dom-testing (>= 1, < 3)
+      railties (>= 4.2.0)
+      thor (>= 0.14, < 2.0)
+    jquery-ui-rails (4.2.1)
+      railties (>= 3.2.16)
+    json (1.8.6)
+    json-jwt (1.12.0)
+      activesupport (>= 4.2)
+      aes_key_wrap
+      bindata
+    jwt (2.2.2)
+    kgio (2.11.3)
+    kickbox (2.0.4)
+      faraday (~> 0.9)
+      json (>= 1.8)
+    language_list (1.2.1)
+    launchy (2.1.1)
+      addressable (~> 2.3)
+    little-plugger (1.1.4)
+    logging (1.7.2)
+      little-plugger (>= 1.1.3)
+    loofah (2.9.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    memoizable (0.4.2)
+      thread_safe (~> 0.3, >= 0.3.1)
+    method_source (1.0.0)
+    mime-types (3.3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2021.0212)
+    mimemagic (0.3.5)
+    mini_mime (1.0.2)
+    mini_portile2 (2.4.0)
+    minitest (5.14.3)
+    mono_logger (1.1.0)
+    multi_json (1.15.0)
+    multi_xml (0.6.0)
+    multipart-post (2.1.1)
+    mustache (0.99.8)
+    naught (1.1.0)
+    netaddr (1.5.1)
+    netrc (0.11.0)
+    newrelic_rpm (6.15.0)
+    nio4r (2.5.2)
+    nokogiri (1.10.10)
+      mini_portile2 (~> 2.4.0)
+    nokogumbo (2.0.4)
+      nokogiri (~> 1.8, >= 1.8.4)
+    non-stupid-digest-assets (1.0.9)
+      sprockets (>= 2.0)
+    oauth (0.5.5)
+    oauth2 (1.4.4)
+      faraday (>= 0.8, < 2.0)
+      jwt (>= 1.0, < 3.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (>= 1.2, < 3)
+    oj (3.1.3)
+    omniauth (1.9.1)
+      hashie (>= 3.4.6)
+      rack (>= 1.6.2, < 3)
+    omniauth-facebook (8.0.0)
+      omniauth-oauth2 (~> 1.2)
+    omniauth-google-oauth2 (0.8.1)
+      jwt (>= 2.0)
+      oauth2 (~> 1.1)
+      omniauth (>= 1.1.1)
+      omniauth-oauth2 (>= 1.6)
+    omniauth-oauth (1.2.0)
+      oauth
+      omniauth (>= 1.0, < 3)
+    omniauth-oauth2 (1.7.1)
+      oauth2 (~> 1.4)
+      omniauth (>= 1.9, < 3)
+    omniauth-stripe-connect (2.10.1)
+      omniauth (~> 1.3)
+      omniauth-oauth2 (~> 1.4)
+    omniauth-twitter (1.4.0)
+      omniauth-oauth (~> 1.1)
+      rack
+    optimist (3.0.1)
+    orm_adapter (0.5.0)
+    paypal-sdk-core (0.3.4)
+      multi_json (~> 1.0)
+      xml-simple
+    paypal-sdk-merchant-jk (1.118.1)
+      paypal-sdk-core (~> 0.3.0)
+    pdf-core (0.7.0)
+    pg (0.17.1)
+    pg_array_parser (0.0.9)
+    pleaserun (0.0.31)
+      cabin (> 0)
+      clamp
+      dotenv
+      insist
+      mustache (= 0.99.8)
+      stud
+    postgres-copy (1.2.0)
+      activerecord (>= 4.0, < 5.1)
+      pg (>= 0.17)
+      responders
+    postgres_ext (3.0.1)
+      activerecord (~> 4.0)
+      arel (>= 4.0.1)
+      pg_array_parser (~> 0.0.9)
+    power_assert (2.0.0)
+    prawn (2.2.2)
+      pdf-core (~> 0.7.0)
+      ttfunk (~> 1.5)
+    prawn-table (0.2.2)
+      prawn (>= 1.3.0, < 3.0.0)
+    protected_attributes (1.1.4)
+      activemodel (>= 4.0.1, < 5.0)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    public_suffix (4.0.6)
+    puma (5.2.0)
+      nio4r (~> 2.0)
+    quiet_assets (1.1.0)
+      railties (>= 3.1, < 5.0)
+    raabro (1.4.0)
+    rabl (0.13.1)
+      activesupport (>= 2.3.14)
+    rack (1.6.13)
+    rack-oauth2 (1.12.0)
+      activesupport
+      attr_required
+      httpclient
+      json-jwt (>= 1.11.0)
+      rack (< 2.1)
+    rack-protection (1.5.5)
+      rack
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (4.2.8)
+      actionmailer (= 4.2.8)
+      actionpack (= 4.2.8)
+      actionview (= 4.2.8)
+      activejob (= 4.2.8)
+      activemodel (= 4.2.8)
+      activerecord (= 4.2.8)
+      activesupport (= 4.2.8)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.2.8)
+      sprockets-rails
+    rails-assets-bluebird (3.5.4)
+    rails-assets-classnames (1.2.2)
+    rails-assets-react-input-autosize (0.4.5)
+    rails-assets-react-select (0.6.7)
+      rails-assets-classnames (>= 1.2.2, < 2)
+      rails-assets-react-input-autosize (>= 0.4.3, < 0.5)
+    rails-assets-reflux (0.3.0)
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.9)
+      activesupport (>= 4.2.0, < 5.0)
+      nokogiri (~> 1.6)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    rails-observers (0.1.5)
+      activemodel (>= 4.0)
+    railties (4.2.8)
+      actionpack (= 4.2.8)
+      activesupport (= 4.2.8)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    raindrops (0.19.1)
+    rake (13.0.3)
+    rb-fsevent (0.10.4)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
+    rbvmomi (2.4.1)
+      builder (~> 3.0)
+      json (>= 1.8)
+      nokogiri (~> 1.5)
+      optimist (~> 3.0)
+    rchardet (1.8.0)
+    react-rails (1.3.3)
+      babel-transpiler (>= 0.7.0)
+      coffee-script-source (~> 1.8)
+      connection_pool
+      execjs
+      rails (>= 3.2)
+      tilt
+    recurly (2.18.16)
+    redis (3.3.3)
+    redis-namespace (1.5.3)
+      redis (~> 3.0, >= 3.0.4)
+    regexp_parser (1.8.2)
+    responders (2.4.1)
+      actionpack (>= 4.2.0, < 6.0)
+      railties (>= 4.2.0, < 6.0)
+    resque (1.27.4)
+      mono_logger (~> 1.0)
+      multi_json (~> 1.0)
+      redis-namespace (~> 1.3)
+      sinatra (>= 0.9.2)
+      vegas (~> 0.1.2)
+    resque-dynamic-queues (0.8.1)
+      resque (~> 1.10)
+    resque-failed-job-mailer (0.0.3)
+    resque-lonely_job (1.0.2)
+      resque (>= 1.2)
+    resque-retry (1.7.4)
+      resque (>= 1.25, < 3.0)
+      resque-scheduler (~> 4.0)
+    resque-scheduler (4.3.0)
+      mono_logger (~> 1.0)
+      redis (~> 3.3)
+      resque (~> 1.26)
+      rufus-scheduler (~> 3.2)
+    resque_mailer (2.4.3)
+      actionmailer (>= 3.0)
+      activesupport (>= 3.0)
+    resque_spec (0.18.1)
+      resque (>= 1.26.0)
+      rspec-core (>= 3.0.0)
+      rspec-expectations (>= 3.0.0)
+      rspec-mocks (>= 3.0.0)
+    rest-client (2.1.0)
+      http-accept (>= 1.7.0, < 2.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
+    retriable (3.0.1)
+    rexml (3.2.5)
+    rspec-collection_matchers (1.2.0)
+      rspec-expectations (>= 2.99.0.beta1)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-rails (4.0.2)
+      actionpack (>= 4.2)
+      activesupport (>= 4.2)
+      railties (>= 4.2)
+      rspec-core (~> 3.10)
+      rspec-expectations (~> 3.10)
+      rspec-mocks (~> 3.10)
+      rspec-support (~> 3.10)
+    rspec-support (3.10.2)
+    ruby-prof (0.15.9)
+    ruby-protocol-buffers (1.2.2)
+    ruby-xz (0.2.3)
+      ffi (~> 1.9)
+      io-like (~> 0.3)
+    ruby_parser (3.15.1)
+      sexp_processor (~> 4.9)
+    rubyzip (1.2.1)
+    rufus-scheduler (3.7.0)
+      fugit (~> 1.1, >= 1.1.6)
+    sanitize (5.2.3)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.8.0)
+      nokogumbo (~> 2.0)
+    sass (3.5.5)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    sass-rails (5.0.7)
+      railties (>= 4.0.0, < 6)
+      sass (~> 3.1)
+      sprockets (>= 2.8, < 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
+      tilt (>= 1.1, < 3)
+    selenium-webdriver (3.14.0)
+      childprocess (~> 0.5)
+      rubyzip (~> 1.2)
+    sendgrid (1.2.0)
+      json
+    sendgrid_toolkit (1.4.0)
+      httparty (>= 0.7.6)
+    sexp_processor (4.15.2)
+    show_me_the_cookies (5.0.1)
+      capybara (>= 2, < 4)
+    signet (0.5.0)
+      addressable (>= 2.2.3)
+      faraday (>= 0.9.0.rc5)
+      jwt (>= 0.1.5)
+      multi_json (>= 1.0.0)
+    simple_oauth (0.3.1)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+    simplecov-rcov (0.2.3)
+      simplecov (>= 0.4.1)
+    sinatra (1.4.8)
+      rack (~> 1.5)
+      rack-protection (~> 1.4)
+      tilt (>= 1.3, < 3)
+    sitemap_generator (6.1.2)
+      builder (~> 3.0)
+    slim (4.1.0)
+      temple (>= 0.7.6, < 0.9)
+      tilt (>= 2.0.6, < 2.1)
+    spork (0.9.0)
+    sprockets (3.6.3)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-es6 (0.9.2)
+      babel-source (>= 5.8.11)
+      babel-transpiler
+      sprockets (>= 3.0.0)
+    sprockets-rails (2.3.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (>= 2.8, < 4.0)
+    stripe (5.29.0)
+    stud (0.0.23)
+    temple (0.8.2)
+    test-unit (3.4.0)
+      power_assert
+    thor (1.1.0)
+    thread_safe (0.3.6)
+    tilt (2.0.10)
+    timecop (0.9.2)
+    ttfunk (1.5.1)
+    twitter (7.0.0)
+      addressable (~> 2.3)
+      buftok (~> 0.2.0)
+      equalizer (~> 0.0.11)
+      http (~> 4.0)
+      http-form_data (~> 2.0)
+      http_parser.rb (~> 0.6.0)
+      memoizable (~> 0.4.0)
+      multipart-post (~> 2.0)
+      naught (~> 1.0)
+      simple_oauth (~> 0.3.0)
+    tzinfo (1.2.9)
+      thread_safe (~> 0.1)
+    uglifier (4.2.0)
+      execjs (>= 0.3.0, < 3)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.7)
+    unicorn (5.8.0)
+      kgio (~> 2.6)
+      raindrops (~> 0.7)
+    uuidtools (2.1.2)
+    vegas (0.1.11)
+      rack (>= 1.0.0)
+    warden (1.2.7)
+      rack (>= 1.0)
+    webdrivers (4.1.2)
+      nokogiri (~> 1.6)
+      rubyzip (~> 1.0)
+      selenium-webdriver (>= 3.0, < 4.0)
+    webmock (3.12.2)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff (>= 0.4.0, < 2.0.0)
+    will_paginate (3.3.0)
+    xml-simple (1.1.8)
+    xmlrpc (0.3.1)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
+    zip-codes (0.2.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  aasm
+  activerecord-import (~> 0.4.1)
+  amqp (= 0.9.8)
+  auto_strip_attributes (= 2.6.0)
+  aws-sdk (~> 1)
+  bcrypt (= 3.1.13)
+  bootstrap-will_paginate (= 0.0.6)
+  bower-rails (~> 0.9.2)
+  bugsnag (= 5.3.2)
+  builder
+  byebug
+  capybara
+  capybara-screenshot (= 1.0.25)
+  carmen
+  carrierwave (= 0.11.2)
+  carrierwave_direct
+  cause
+  coffee-rails
+  coffee-script-source (= 1.12.2)
+  database_cleaner (= 1.3.0)
+  devise (= 3.3.0)
+  elasticsearch
+  em-websocket (>= 0.4.0)
+  email_validator (= 1.6.0)
+  eventmachine (= 1.2.3)
+  execjs (= 2.6.0)
+  factory_girl_rails
+  faker (= 1.3.0)
+  faraday (= 0.9.2)
+  fb_graph (= 2.5.9)
+  filepicker-rails (= 0.1.0)
+  fog
+  fog-brightbox (= 0.11.0)
+  fpm
+  geokit-rails
+  god
+  gon (~> 4.1.0)
+  google-api-client
+  haml-rails (= 0.9.0)
+  htmlentities
+  icalendar (= 2.4.0)
+  influxdb (= 0.3.14)
+  influxdb-rails (= 0.1.12)
+  iso-639
+  jam_ruby!
+  jam_websockets!
+  jampb!
+  jquery-rails
+  jquery-ui-rails (= 4.2.1)
+  kickbox
+  language_list
+  launchy (= 2.1.1)
+  logging (= 1.7.2)
+  multi_json
+  netaddr (= 1.5.1)
+  newrelic_rpm
+  nokogiri (= 1.10.10)
+  non-stupid-digest-assets
+  oj (= 3.1.3)
+  omniauth
+  omniauth-facebook
+  omniauth-google-oauth2
+  omniauth-stripe-connect
+  omniauth-twitter
+  paypal-sdk-merchant-jk (= 1.118.1)
+  pg (= 0.17.1)
+  postgres-copy
+  postgres_ext
+  prawn-table
+  protected_attributes
+  pry
+  puma
+  quiet_assets
+  rabl (= 0.13.1)
+  rack-test
+  rails (= 4.2.8)
+  rails-assets-bluebird!
+  rails-assets-classnames!
+  rails-assets-react-select (= 0.6.7)!
+  rails-assets-reflux (= 0.3.0)!
+  rails-observers
+  railties (= 4.2.8)
+  react-rails (= 1.3.3)
+  recurly (= 2.18.16)
+  redis (= 3.3.3)
+  redis-namespace (= 1.5.3)
+  responders (~> 2.0)
+  resque
+  resque-dynamic-queues
+  resque-failed-job-mailer
+  resque-lonely_job (~> 1.0.0)
+  resque-retry
+  resque-scheduler (= 4.3.0)
+  resque_mailer
+  resque_spec
+  rest-client
+  retriable (= 3.0.1)
+  rspec-collection_matchers
+  rspec-rails
+  ruby-prof (= 0.15.9)
+  ruby-protocol-buffers (= 1.2.2)
+  rubyzip (= 1.2.1)
+  sanitize
+  sass (= 3.5.5)
+  sass-rails (= 5.0.7)
+  selenium-webdriver
+  sendgrid (= 1.2.0)
+  sendgrid_toolkit (>= 1.1.1)
+  show_me_the_cookies
+  signet (= 0.5.0)
+  simplecov (~> 0.7.1)
+  simplecov-rcov
+  sitemap_generator
+  slim
+  spork (= 0.9.0)
+  sprockets (= 3.6.3)
+  sprockets-es6
+  sprockets-rails (= 2.3.2)
+  stripe
+  test-unit
+  timecop
+  twitter
+  uglifier
+  unf
+  unicorn
+  uuidtools (= 2.1.2)
+  webdrivers (~> 4.0)
+  webmock (~> 3.11, >= 3.11.2)
+  will_paginate
+  zip-codes
+
+RUBY VERSION
+   ruby 2.4.1p111
+
+BUNDLED WITH
+   1.17.3
diff --git a/web/Gemfile.lock b/web/Gemfile.lock
index 1a150ba57..ac574eece 100644
--- a/web/Gemfile.lock
+++ b/web/Gemfile.lock
@@ -18,7 +18,7 @@ GEM
   remote: https://rails-assets.org/
   specs:
     CFPropertyList (2.3.6)
-    aasm (5.1.1)
+    aasm (5.2.0)
       concurrent-ruby (~> 1.0)
     actionmailer (4.2.8)
       actionpack (= 4.2.8)
@@ -56,7 +56,7 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.7.0)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     aes_key_wrap (1.1.0)
     aliyun-sdk (0.8.0)
@@ -71,7 +71,7 @@ GEM
       amq-protocol (>= 0.9.4)
       eventmachine
     arel (6.0.4)
-    arr-pm (0.0.10)
+    arr-pm (0.0.11)
       cabin (> 0)
     attr_required (1.0.1)
     auto_strip_attributes (2.6.0)
@@ -89,24 +89,24 @@ GEM
     babel-transpiler (0.7.0)
       babel-source (>= 4.0, < 6)
       execjs (~> 2.0)
-    backports (3.20.2)
+    backports (3.23.0)
     bcrypt (3.1.13)
-    bindata (2.4.8)
+    bindata (2.4.10)
     bootstrap-will_paginate (0.0.6)
       will_paginate
     bower-rails (0.9.2)
     buftok (0.2.0)
     bugsnag (5.3.2)
     builder (3.2.4)
-    byebug (11.0.1)
+    byebug (11.1.3)
     cabin (0.9.0)
-    capybara (3.15.1)
+    capybara (3.32.2)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
-      regexp_parser (~> 1.2)
+      regexp_parser (~> 1.5)
       xpath (~> 3.2)
     capybara-screenshot (1.0.25)
       capybara (>= 1.0, < 4)
@@ -134,8 +134,8 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.1.8)
-    connection_pool (2.2.3)
+    concurrent-ruby (1.1.10)
+    connection_pool (2.2.5)
     crack (0.4.5)
       rexml
     crass (1.0.6)
@@ -146,7 +146,7 @@ GEM
       railties (>= 3.2.6, < 5)
       thread_safe (~> 0.1)
       warden (~> 1.2.3)
-    diff-lcs (1.4.4)
+    diff-lcs (1.5.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.7.6)
@@ -158,17 +158,17 @@ GEM
     elasticsearch-transport (7.4.0)
       faraday
       multi_json
-    em-websocket (0.5.2)
+    em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
-      http_parser.rb (~> 0.6.0)
+      http_parser.rb (~> 0)
     email_validator (1.6.0)
       activemodel
     equalizer (0.0.11)
     erubis (2.7.0)
-    et-orbi (1.2.4)
+    et-orbi (1.2.7)
       tzinfo
     eventmachine (1.2.3)
-    excon (0.79.0)
+    excon (0.92.3)
     execjs (2.6.0)
     extlib (0.9.16)
     factory_girl (4.9.0)
@@ -185,7 +185,7 @@ GEM
       json
       rack-oauth2 (>= 0.14.4)
       tzinfo
-    ffi (1.12.2)
+    ffi (1.15.5)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
@@ -284,7 +284,7 @@ GEM
     fog-json (1.2.0)
       fog-core
       multi_json (~> 1.10)
-    fog-local (0.6.0)
+    fog-local (0.8.0)
       fog-core (>= 1.27, < 3.0)
     fog-openstack (0.3.10)
       fog-core (>= 1.45, <= 2.1.0)
@@ -331,37 +331,35 @@ GEM
     fog-voxel (0.1.0)
       fog-core
       fog-xml
-    fog-vsphere (3.5.0)
+    fog-vsphere (3.5.2)
       fog-core
       rbvmomi (>= 1.9, < 3)
     fog-xenserver (1.0.0)
       fog-core
       fog-xml
       xmlrpc
-    fog-xml (0.1.3)
+    fog-xml (0.1.4)
       fog-core
       nokogiri (>= 1.5.11, < 2.0.0)
-    formatador (0.2.5)
-    fpm (1.12.0)
-      arr-pm (~> 0.0.10)
+    formatador (0.3.0)
+    fpm (1.14.2)
+      arr-pm (~> 0.0.11)
       backports (>= 2.6.2)
       cabin (>= 0.6.0)
-      childprocess (< 1.0.0)
       clamp (~> 1.0.0)
-      ffi (~> 1.12.0)
       git (>= 1.3.0, < 2.0)
       json (>= 1.7.7, < 3.0)
       pleaserun (~> 0.0.29)
-      ruby-xz (~> 0.2.3)
+      rexml
       stud
-    fugit (1.4.2)
-      et-orbi (~> 1.1, >= 1.1.8)
+    fugit (1.5.3)
+      et-orbi (~> 1, >= 1.2.7)
       raabro (~> 1.4)
     geokit (1.13.1)
     geokit-rails (2.3.2)
       geokit (~> 1.5)
       rails (>= 3.0)
-    git (1.8.1)
+    git (1.11.0)
       rchardet (~> 1.8)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
@@ -389,7 +387,7 @@ GEM
       html2haml (>= 1.0.1)
       railties (>= 4.0.1)
     hashdiff (1.0.1)
-    hashie (4.1.0)
+    hashie (5.0.0)
     html2haml (2.2.0)
       erubis (~> 2.7.0)
       haml (>= 4.0, < 6)
@@ -402,13 +400,13 @@ GEM
       http-form_data (~> 2.2)
       http-parser (~> 1.2.0)
     http-accept (1.7.0)
-    http-cookie (1.0.3)
+    http-cookie (1.0.5)
       domain_name (~> 0.5)
     http-form_data (2.3.0)
     http-parser (1.2.3)
       ffi-compiler (>= 1.0, < 2.0)
     http_parser.rb (0.6.0)
-    httparty (0.18.1)
+    httparty (0.20.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
     httpclient (2.8.3)
@@ -423,22 +421,21 @@ GEM
       influxdb (~> 0.3.0)
       railties
     insist (1.0.0)
-    io-like (0.3.1)
     ipaddress (0.8.3)
     iso-639 (0.3.5)
-    jquery-rails (4.4.0)
+    jquery-rails (4.5.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (4.2.1)
       railties (>= 3.2.16)
     json (1.8.6)
-    json-jwt (1.12.0)
+    json-jwt (1.13.0)
       activesupport (>= 4.2)
       aes_key_wrap
       bindata
-    jwt (2.2.2)
-    kgio (2.11.3)
+    jwt (2.3.0)
+    kgio (2.11.4)
     kickbox (2.0.4)
       faraday (~> 0.9)
       json (>= 1.8)
@@ -448,7 +445,7 @@ GEM
     little-plugger (1.1.4)
     logging (1.7.2)
       little-plugger (>= 1.1.3)
-    loofah (2.9.0)
+    loofah (2.18.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -456,32 +453,34 @@ GEM
     memoizable (0.4.2)
       thread_safe (~> 0.3, >= 0.3.1)
     method_source (1.0.0)
-    mime-types (3.3.1)
+    mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0212)
-    mimemagic (0.3.5)
-    mini_mime (1.0.2)
+    mime-types-data (3.2022.0105)
+    mimemagic (0.3.10)
+      nokogiri (~> 1)
+      rake
+    mini_mime (1.1.2)
     mini_portile2 (2.4.0)
-    minitest (5.14.3)
-    mono_logger (1.1.0)
+    minitest (5.15.0)
+    mono_logger (1.1.1)
     multi_json (1.15.0)
     multi_xml (0.6.0)
-    multipart-post (2.1.1)
+    multipart-post (2.2.3)
     mustache (0.99.8)
     naught (1.1.0)
     netaddr (1.5.1)
     netrc (0.11.0)
-    newrelic_rpm (6.15.0)
-    nio4r (2.5.2)
+    newrelic_rpm (8.8.0)
+    nio4r (2.5.8)
     nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
-    nokogumbo (2.0.4)
+    nokogumbo (2.0.5)
       nokogiri (~> 1.8, >= 1.8.4)
     non-stupid-digest-assets (1.0.9)
       sprockets (>= 2.0)
-    oauth (0.5.5)
-    oauth2 (1.4.4)
-      faraday (>= 0.8, < 2.0)
+    oauth (0.5.10)
+    oauth2 (1.4.8)
+      faraday (>= 0.8, < 3.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
@@ -490,18 +489,18 @@ GEM
     omniauth (1.9.1)
       hashie (>= 3.4.6)
       rack (>= 1.6.2, < 3)
-    omniauth-facebook (8.0.0)
+    omniauth-facebook (9.0.0)
       omniauth-oauth2 (~> 1.2)
-    omniauth-google-oauth2 (0.8.1)
+    omniauth-google-oauth2 (0.8.2)
       jwt (>= 2.0)
       oauth2 (~> 1.1)
-      omniauth (>= 1.1.1)
+      omniauth (~> 1.1)
       omniauth-oauth2 (>= 1.6)
     omniauth-oauth (1.2.0)
       oauth
       omniauth (>= 1.0, < 3)
-    omniauth-oauth2 (1.7.1)
-      oauth2 (~> 1.4)
+    omniauth-oauth2 (1.7.3)
+      oauth2 (>= 1.4, < 3)
       omniauth (>= 1.9, < 3)
     omniauth-stripe-connect (2.10.1)
       omniauth (~> 1.3)
@@ -519,7 +518,7 @@ GEM
     pdf-core (0.7.0)
     pg (0.17.1)
     pg_array_parser (0.0.9)
-    pleaserun (0.0.31)
+    pleaserun (0.0.32)
       cabin (> 0)
       clamp
       dotenv
@@ -534,7 +533,7 @@ GEM
       activerecord (~> 4.0)
       arel (>= 4.0.1)
       pg_array_parser (~> 0.0.9)
-    power_assert (2.0.0)
+    power_assert (2.0.1)
     prawn (2.2.2)
       pdf-core (~> 0.7.0)
       ttfunk (~> 1.5)
@@ -542,11 +541,11 @@ GEM
       prawn (>= 1.3.0, < 3.0.0)
     protected_attributes (1.1.4)
       activemodel (>= 4.0.1, < 5.0)
-    pry (0.13.1)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (4.0.6)
-    puma (5.2.0)
+    public_suffix (4.0.7)
+    puma (5.6.4)
       nio4r (~> 2.0)
     quiet_assets (1.1.0)
       railties (>= 3.1, < 5.0)
@@ -554,6 +553,8 @@ GEM
     rabl (0.13.1)
       activesupport (>= 2.3.14)
     rack (1.6.13)
+    rack-cors (1.0.6)
+      rack (>= 1.6.0)
     rack-oauth2 (1.12.0)
       activesupport
       attr_required
@@ -582,13 +583,13 @@ GEM
       rails-assets-classnames (>= 1.2.2, < 2)
       rails-assets-react-input-autosize (>= 0.4.3, < 0.5)
     rails-assets-reflux (0.3.0)
-    rails-deprecated_sanitizer (1.0.3)
+    rails-deprecated_sanitizer (1.0.4)
       activesupport (>= 4.2.0.alpha)
     rails-dom-testing (1.0.9)
       activesupport (>= 4.2.0, < 5.0)
       nokogiri (~> 1.6)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.3.0)
+    rails-html-sanitizer (1.4.3)
       loofah (~> 2.3)
     rails-observers (0.1.5)
       activemodel (>= 4.0)
@@ -597,9 +598,9 @@ GEM
       activesupport (= 4.2.8)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    raindrops (0.19.1)
-    rake (13.0.3)
-    rb-fsevent (0.10.4)
+    raindrops (0.20.0)
+    rake (13.0.6)
+    rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rbvmomi (2.4.1)
@@ -634,7 +635,7 @@ GEM
     resque-failed-job-mailer (0.0.3)
     resque-lonely_job (1.0.2)
       resque (>= 1.2)
-    resque-retry (1.7.4)
+    resque-retry (1.7.6)
       resque (>= 1.25, < 3.0)
       resque-scheduler (~> 4.0)
     resque-scheduler (4.3.0)
@@ -659,15 +660,15 @@ GEM
     rexml (3.2.5)
     rspec-collection_matchers (1.2.0)
       rspec-expectations (>= 2.99.0.beta1)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-rails (4.0.2)
+      rspec-support (~> 3.11.0)
+    rspec-rails (4.1.2)
       actionpack (>= 4.2)
       activesupport (>= 4.2)
       railties (>= 4.2)
@@ -675,16 +676,13 @@ GEM
       rspec-expectations (~> 3.10)
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
-    rspec-support (3.10.2)
+    rspec-support (3.11.0)
     ruby-prof (0.15.9)
     ruby-protocol-buffers (1.2.2)
-    ruby-xz (0.2.3)
-      ffi (~> 1.9)
-      io-like (~> 0.3)
-    ruby_parser (3.15.1)
-      sexp_processor (~> 4.9)
+    ruby_parser (3.19.1)
+      sexp_processor (~> 4.16)
     rubyzip (1.2.1)
-    rufus-scheduler (3.7.0)
+    rufus-scheduler (3.8.1)
       fugit (~> 1.1, >= 1.1.6)
     sanitize (5.2.3)
       crass (~> 1.0.2)
@@ -708,7 +706,7 @@ GEM
       json
     sendgrid_toolkit (1.4.0)
       httparty (>= 0.7.6)
-    sexp_processor (4.15.2)
+    sexp_processor (4.16.1)
     show_me_the_cookies (5.0.1)
       capybara (>= 2, < 4)
     signet (0.5.0)
@@ -721,13 +719,13 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
-    simplecov-rcov (0.2.3)
+    simplecov-rcov (0.3.1)
       simplecov (>= 0.4.1)
     sinatra (1.4.8)
       rack (~> 1.5)
       rack-protection (~> 1.4)
       tilt (>= 1.3, < 3)
-    sitemap_generator (6.1.2)
+    sitemap_generator (6.2.1)
       builder (~> 3.0)
     slim (4.1.0)
       temple (>= 0.7.6, < 0.9)
@@ -744,16 +742,16 @@ GEM
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
-    stripe (5.29.0)
+    stripe (6.5.0)
     stud (0.0.23)
     temple (0.8.2)
-    test-unit (3.4.0)
+    test-unit (3.5.3)
       power_assert
-    thor (1.1.0)
+    thor (1.2.1)
     thread_safe (0.3.6)
     tilt (2.0.10)
-    timecop (0.9.2)
-    ttfunk (1.5.1)
+    timecop (0.9.5)
+    ttfunk (1.6.2.1)
     twitter (7.0.0)
       addressable (~> 2.3)
       buftok (~> 0.2.0)
@@ -767,12 +765,14 @@ GEM
       simple_oauth (~> 0.3.0)
     tzinfo (1.2.9)
       thread_safe (~> 0.1)
+    tzinfo-data (1.2022.1)
+      tzinfo (>= 1.0.0)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.7)
-    unicorn (5.8.0)
+    unf_ext (0.0.8.2)
+    unicorn (6.1.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
     uuidtools (2.1.2)
@@ -784,13 +784,16 @@ GEM
       nokogiri (~> 1.6)
       rubyzip (~> 1.0)
       selenium-webdriver (>= 3.0, < 4.0)
-    webmock (3.12.2)
-      addressable (>= 2.3.6)
+    webmock (3.14.0)
+      addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    will_paginate (3.3.0)
-    xml-simple (1.1.8)
-    xmlrpc (0.3.1)
+    webrick (1.7.0)
+    will_paginate (3.3.1)
+    xml-simple (1.1.9)
+      rexml
+    xmlrpc (0.3.2)
+      webrick
     xpath (3.2.0)
       nokogiri (~> 1.8)
     zip-codes (0.2.1)
@@ -852,6 +855,7 @@ DEPENDENCIES
   language_list
   launchy (= 2.1.1)
   logging (= 1.7.2)
+  mimemagic (~> 0.3.5)
   multi_json
   netaddr (= 1.5.1)
   newrelic_rpm
@@ -873,6 +877,7 @@ DEPENDENCIES
   puma
   quiet_assets
   rabl (= 0.13.1)
+  rack-cors (~> 1.0, >= 1.0.6)
   rack-test
   rails (= 4.2.8)
   rails-assets-bluebird!
@@ -921,6 +926,7 @@ DEPENDENCIES
   test-unit
   timecop
   twitter
+  tzinfo-data
   uglifier
   unf
   unicorn
diff --git a/web/config/application.rb b/web/config/application.rb
index b3361beea..118021aae 100644
--- a/web/config/application.rb
+++ b/web/config/application.rb
@@ -99,8 +99,8 @@ if defined?(Bundler)
     config.assets.precompile += %w( modern/scripts.js )
 
     # where is rabbitmq?
-    config.rabbitmq_host = "127.0.0.1"
-    config.rabbitmq_port = 5672
+    config.rabbitmq_host = ENV['RABBITMQ_HOST'] || "127.0.0.1"
+    config.rabbitmq_port = ENV['RABBITMQ_PORT'] ||  5672
 
     # filepicker app configured to use S3 bucket jamkazam-dev
     config.filepicker_rails.api_key = "Asx4wh6GSlmpAAzoM0Cunz"
diff --git a/web/config/database.yml b/web/config/database.yml
index 47804c31a..de5295380 100644
--- a/web/config/database.yml
+++ b/web/config/database.yml
@@ -1,3 +1,28 @@
+# default: &default
+#   adapter: postgresql
+#   encoding: unicode
+#   database: <%= ENV['POSTGRES_DB'] %>
+#   username: <%= ENV['POSTGRES_USER'] %>
+#   password: <%= ENV['POSTGRES_PASSWORD'] %>
+#   port: <%= ENV['POSTGRES_PORT'] || '5432' %>
+#   host: <%= ENV['POSTGRES_HOST'] %>
+#   pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 10 } %>
+#   timeout: 5000
+
+# development:
+#   <<: *default
+
+# test: &test 
+#   <<: *default
+
+# production:
+#   <<: *default
+
+# cucumber:
+#   <<: *test
+
+#------------
+
 # SQLite version 3.x
 #   gem install sqlite3
 #
@@ -8,7 +33,7 @@ development:
   database: jam
   username: postgres
   password: postgres
-  host: localhost
+  host: database
   pool: 5
   timeout: 5000
 
@@ -20,7 +45,7 @@ test: &test
   database: jam_web_test
   username: postgres
   password: postgres
-  host: localhost
+  host: database
   pool: 5
   timeout: 5000
   min_messages: warning
@@ -30,9 +55,9 @@ production:
   database: jam
   username: postgres
   password: postgres
-  host: localhost
+  host: database
   pool: 5
   timeout: 5000
 
 cucumber:
-  <<: *test
+  <<: *test
\ No newline at end of file
diff --git a/web/config/database_copy.yml b/web/config/database_copy.yml
new file mode 100644
index 000000000..6706ac97c
--- /dev/null
+++ b/web/config/database_copy.yml
@@ -0,0 +1,38 @@
+# SQLite version 3.x
+#   gem install sqlite3
+#
+#   Ensure the SQLite 3 gem is defined in your Gemfile
+#   gem 'sqlite3'
+development:
+  adapter: postgresql
+  database: jam
+  username: postgres
+  password: postgres
+  host: localhost
+  pool: 5
+  timeout: 5000
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test: &test
+  adapter: postgresql
+  database: jam_web_test
+  username: postgres
+  password: postgres
+  host: localhost
+  pool: 5
+  timeout: 5000
+  min_messages: warning
+
+production:
+  adapter: postgresql
+  database: jam
+  username: postgres
+  password: postgres
+  host: database
+  pool: 5
+  timeout: 5000
+
+cucumber:
+  <<: *test
diff --git a/websocket-gateway/Gemfile b/websocket-gateway/Gemfile
index db64d6b8c..a1dfc9ce2 100644
--- a/websocket-gateway/Gemfile
+++ b/websocket-gateway/Gemfile
@@ -45,7 +45,9 @@ gem 'redis', '3.3.3' # pinned until we are on 2.5; then remove
 gem 'redis-namespace', '1.5.3' # pinned until we are on 2.5; then remove
 gem 'oj', '3.1.3' # pinned until we are on 2.5; then remove
 gem 'bcrypt', '3.1.13'
-gem 'mimemagic', :source => 'https://int.jamkazam.com/gems/'
+#gem 'mimemagic', :source => 'https://int.jamkazam.com/gems/'
+gem 'mimemagic', '~> 0.3.5'
+gem 'tzinfo-data'
 #######
 
 
diff --git a/websocket-gateway/Gemfile-bk.lock b/websocket-gateway/Gemfile-bk.lock
new file mode 100644
index 000000000..81773b3b7
--- /dev/null
+++ b/websocket-gateway/Gemfile-bk.lock
@@ -0,0 +1,615 @@
+PATH
+  remote: ../pb/target/ruby/jampb
+  specs:
+    jampb (0.1.1)
+
+PATH
+  remote: ../ruby
+  specs:
+    jam_ruby (0.1.1)
+
+GEM
+  remote: http://rubygems.org/
+  remote: https://int.jamkazam.com/gems/
+  specs:
+    CFPropertyList (2.3.6)
+    aasm (5.1.1)
+      concurrent-ruby (~> 1.0)
+    actionmailer (4.2.8)
+      actionpack (= 4.2.8)
+      actionview (= 4.2.8)
+      activejob (= 4.2.8)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.8)
+      actionview (= 4.2.8)
+      activesupport (= 4.2.8)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.8)
+      activesupport (= 4.2.8)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (4.2.8)
+      activesupport (= 4.2.8)
+      globalid (>= 0.3.0)
+    activemodel (4.2.8)
+      activesupport (= 4.2.8)
+      builder (~> 3.1)
+    activerecord (4.2.8)
+      activemodel (= 4.2.8)
+      activesupport (= 4.2.8)
+      arel (~> 6.0)
+    activesupport (4.2.8)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    aliyun-sdk (0.8.0)
+      nokogiri (~> 1.6)
+      rest-client (~> 2.0)
+    amq-protocol (2.3.2)
+    amqp (1.8.0)
+      amq-protocol (>= 2.2.0)
+      eventmachine
+    arel (6.0.4)
+    arr-pm (0.0.10)
+      cabin (> 0)
+    auto_strip_attributes (2.6.0)
+      activerecord (>= 4.0)
+    aws-sdk (1.67.0)
+      aws-sdk-v1 (= 1.67.0)
+    aws-sdk-v1 (1.67.0)
+      json (~> 1.4)
+      nokogiri (~> 1)
+    backports (3.20.2)
+    bcrypt (3.1.13)
+    bugsnag (5.3.2)
+    builder (3.2.4)
+    cabin (0.9.0)
+    carrierwave (0.11.2)
+      activemodel (>= 3.2.0)
+      activesupport (>= 3.2.0)
+      json (>= 1.7)
+      mime-types (>= 1.16)
+      mimemagic (>= 0.3.0)
+    cause (0.1)
+    childprocess (0.9.0)
+      ffi (~> 1.0, >= 1.0.11)
+    clamp (1.0.1)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.8)
+    crass (1.0.6)
+    cucumber (4.1.0)
+      builder (~> 3.2, >= 3.2.3)
+      cucumber-core (~> 7.1, >= 7.1.0)
+      cucumber-create-meta (~> 1.0.0, >= 1.0.0)
+      cucumber-cucumber-expressions (~> 10.1, >= 10.1.0)
+      cucumber-gherkin (~> 14.0, >= 14.0.1)
+      cucumber-html-formatter (~> 7.0, >= 7.0.0)
+      cucumber-messages (~> 12.2, >= 12.2.0)
+      cucumber-wire (~> 3.1, >= 3.1.0)
+      diff-lcs (~> 1.3, >= 1.3, < 1.4)
+      multi_test (~> 0.1, >= 0.1.2)
+      sys-uname (~> 1.0, >= 1.0.2)
+    cucumber-core (7.1.0)
+      cucumber-gherkin (~> 14.0, >= 14.0.1)
+      cucumber-messages (~> 12.2, >= 12.2.0)
+      cucumber-tag-expressions (~> 2.0, >= 2.0.4)
+    cucumber-create-meta (1.0.0)
+      cucumber-messages (~> 12.2, >= 12.2.0)
+      sys-uname (~> 1.2, >= 1.2.1)
+    cucumber-cucumber-expressions (10.3.0)
+    cucumber-gherkin (14.2.0)
+      cucumber-messages (~> 12.4, >= 12.4.0)
+    cucumber-html-formatter (7.2.0)
+      cucumber-messages (~> 12.4, >= 12.4.0)
+    cucumber-messages (12.4.0)
+      protobuf-cucumber (~> 3.10, >= 3.10.8)
+    cucumber-tag-expressions (2.0.4)
+    cucumber-wire (3.1.0)
+      cucumber-core (~> 7.1, >= 7.1.0)
+      cucumber-cucumber-expressions (~> 10.1, >= 10.1.0)
+      cucumber-messages (~> 12.2, >= 12.2.0)
+    database_cleaner (1.99.0)
+    devise (3.3.0)
+      bcrypt (~> 3.0)
+      orm_adapter (~> 0.1)
+      railties (>= 3.2.6, < 5)
+      thread_safe (~> 0.1)
+      warden (~> 1.2.3)
+    diff-lcs (1.3)
+    domain_name (0.5.20190701)
+      unf (>= 0.0.5, < 1.0.0)
+    dotenv (2.7.6)
+    elasticsearch (7.4.0)
+      elasticsearch-api (= 7.4.0)
+      elasticsearch-transport (= 7.4.0)
+    elasticsearch-api (7.4.0)
+      multi_json
+    elasticsearch-transport (7.4.0)
+      faraday
+      multi_json
+    em-websocket (0.5.2)
+      eventmachine (>= 0.12.9)
+      http_parser.rb (~> 0.6.0)
+    email_validator (1.6.0)
+      activemodel
+    erubis (2.7.0)
+    et-orbi (1.2.4)
+      tzinfo
+    evented-spec (0.9.0)
+    eventmachine (1.2.7)
+    excon (0.79.0)
+    factory_girl (4.9.0)
+      activesupport (>= 3.0.0)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    ffi (1.12.2)
+    fission (0.5.0)
+      CFPropertyList (~> 2.2)
+    fog (1.41.0)
+      fog-aliyun (>= 0.1.0)
+      fog-atmos
+      fog-aws (>= 0.6.0)
+      fog-brightbox (~> 0.4)
+      fog-cloudatcost (~> 0.1.0)
+      fog-core (~> 1.45)
+      fog-digitalocean (>= 0.3.0)
+      fog-dnsimple (~> 1.0)
+      fog-dynect (~> 0.0.2)
+      fog-ecloud (~> 0.1)
+      fog-google (<= 0.1.0)
+      fog-internet-archive
+      fog-joyent
+      fog-json
+      fog-local
+      fog-openstack
+      fog-powerdns (>= 0.1.1)
+      fog-profitbricks
+      fog-rackspace
+      fog-radosgw (>= 0.0.2)
+      fog-riakcs
+      fog-sakuracloud (>= 0.0.4)
+      fog-serverlove
+      fog-softlayer
+      fog-storm_on_demand
+      fog-terremark
+      fog-vmfusion
+      fog-voxel
+      fog-vsphere (>= 0.4.0)
+      fog-xenserver
+      fog-xml (~> 0.1.1)
+      ipaddress (~> 0.5)
+      json (>= 1.8, < 2.0)
+    fog-aliyun (0.3.19)
+      aliyun-sdk (~> 0.8.0)
+      fog-core
+      fog-json
+      ipaddress (~> 0.8)
+      xml-simple (~> 1.1)
+    fog-atmos (0.1.0)
+      fog-core
+      fog-xml
+    fog-aws (2.0.1)
+      fog-core (~> 1.38)
+      fog-json (~> 1.0)
+      fog-xml (~> 0.1)
+      ipaddress (~> 0.8)
+    fog-brightbox (0.11.0)
+      fog-core (~> 1.22)
+      fog-json
+      inflecto (~> 0.0.2)
+    fog-cloudatcost (0.1.2)
+      fog-core (~> 1.36)
+      fog-json (~> 1.0)
+      fog-xml (~> 0.1)
+      ipaddress (~> 0.8)
+    fog-core (1.45.0)
+      builder
+      excon (~> 0.58)
+      formatador (~> 0.2)
+    fog-digitalocean (0.4.0)
+      fog-core
+      fog-json
+      fog-xml
+      ipaddress (>= 0.5)
+    fog-dnsimple (1.0.0)
+      fog-core (~> 1.38)
+      fog-json (~> 1.0)
+    fog-dynect (0.0.3)
+      fog-core
+      fog-json
+      fog-xml
+    fog-ecloud (0.3.0)
+      fog-core
+      fog-xml
+    fog-google (0.1.0)
+      fog-core
+      fog-json
+      fog-xml
+    fog-internet-archive (0.0.2)
+      fog-core
+      fog-json
+      fog-xml
+    fog-joyent (0.0.1)
+      fog-core (~> 1.42)
+      fog-json (>= 1.0)
+    fog-json (1.2.0)
+      fog-core
+      multi_json (~> 1.10)
+    fog-local (0.6.0)
+      fog-core (>= 1.27, < 3.0)
+    fog-openstack (0.3.10)
+      fog-core (>= 1.45, <= 2.1.0)
+      fog-json (>= 1.0)
+      ipaddress (>= 0.8)
+    fog-powerdns (0.2.0)
+      fog-core
+      fog-json
+      fog-xml
+    fog-profitbricks (4.1.1)
+      fog-core (~> 1.42)
+      fog-json (~> 1.0)
+    fog-rackspace (0.1.6)
+      fog-core (>= 1.35)
+      fog-json (>= 1.0)
+      fog-xml (>= 0.1)
+      ipaddress (>= 0.8)
+    fog-radosgw (0.0.5)
+      fog-core (>= 1.21.0)
+      fog-json
+      fog-xml (>= 0.0.1)
+    fog-riakcs (0.1.0)
+      fog-core
+      fog-json
+      fog-xml
+    fog-sakuracloud (1.7.5)
+      fog-core
+      fog-json
+    fog-serverlove (0.1.2)
+      fog-core
+      fog-json
+    fog-softlayer (1.1.4)
+      fog-core
+      fog-json
+    fog-storm_on_demand (0.1.1)
+      fog-core
+      fog-json
+    fog-terremark (0.1.0)
+      fog-core
+      fog-xml
+    fog-vmfusion (0.1.0)
+      fission
+      fog-core
+    fog-voxel (0.1.0)
+      fog-core
+      fog-xml
+    fog-vsphere (3.5.0)
+      fog-core
+      rbvmomi (>= 1.9, < 3)
+    fog-xenserver (1.0.0)
+      fog-core
+      fog-xml
+      xmlrpc
+    fog-xml (0.1.3)
+      fog-core
+      nokogiri (>= 1.5.11, < 2.0.0)
+    formatador (0.2.5)
+    fpm (1.12.0)
+      arr-pm (~> 0.0.10)
+      backports (>= 2.6.2)
+      cabin (>= 0.6.0)
+      childprocess (< 1.0.0)
+      clamp (~> 1.0.0)
+      ffi (~> 1.12.0)
+      git (>= 1.3.0, < 2.0)
+      json (>= 1.7.7, < 3.0)
+      pleaserun (~> 0.0.29)
+      ruby-xz (~> 0.2.3)
+      stud
+    fugit (1.4.2)
+      et-orbi (~> 1.1, >= 1.1.8)
+      raabro (~> 1.4)
+    geokit (1.13.1)
+    geokit-rails (2.3.2)
+      geokit (~> 1.5)
+      rails (>= 3.0)
+    git (1.8.1)
+      rchardet (~> 1.8)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
+    http-accept (1.7.0)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
+    http_parser.rb (0.6.0)
+    httparty (0.16.2)
+      multi_xml (>= 0.5.2)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    icalendar (2.4.0)
+    inflecto (0.0.2)
+    insist (1.0.0)
+    io-like (0.3.1)
+    ipaddress (0.8.3)
+    iso-639 (0.3.5)
+    json (1.8.6)
+    kickbox (2.0.4)
+      faraday (~> 0.9)
+      json (>= 1.8)
+    language_list (1.2.1)
+    little-plugger (1.1.4)
+    logging (1.7.2)
+      little-plugger (>= 1.1.3)
+    loofah (2.9.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    method_source (1.0.0)
+    middleware (0.1.0)
+    mime-types (1.25.1)
+    mimemagic (0.3.5)
+    mini_mime (1.0.2)
+    mini_portile2 (2.4.0)
+    minitest (5.14.3)
+    mono_logger (1.1.0)
+    multi_json (1.15.0)
+    multi_test (0.1.2)
+    multi_xml (0.6.0)
+    multipart-post (2.1.1)
+    mustache (0.99.8)
+    netaddr (1.5.1)
+    netrc (0.11.0)
+    newrelic_rpm (6.15.0)
+    nokogiri (1.10.10)
+      mini_portile2 (~> 2.4.0)
+    nokogumbo (2.0.4)
+      nokogiri (~> 1.8, >= 1.8.4)
+    oj (3.1.3)
+    optimist (3.0.1)
+    orm_adapter (0.5.0)
+    pg (0.17.1)
+    pg_array_parser (0.0.9)
+    pleaserun (0.0.31)
+      cabin (> 0)
+      clamp
+      dotenv
+      insist
+      mustache (= 0.99.8)
+      stud
+    postgres-copy (1.2.0)
+      activerecord (>= 4.0, < 5.1)
+      pg (>= 0.17)
+      responders
+    postgres_ext (3.0.1)
+      activerecord (~> 4.0)
+      arel (>= 4.0.1)
+      pg_array_parser (~> 0.0.9)
+    protected_attributes (1.1.4)
+      activemodel (>= 4.0.1, < 5.0)
+    protobuf-cucumber (3.10.8)
+      activesupport (>= 3.2)
+      middleware
+      thor
+      thread_safe
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    raabro (1.4.0)
+    rack (1.6.13)
+    rack-protection (1.5.5)
+      rack
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (4.2.8)
+      actionmailer (= 4.2.8)
+      actionpack (= 4.2.8)
+      actionview (= 4.2.8)
+      activejob (= 4.2.8)
+      activemodel (= 4.2.8)
+      activerecord (= 4.2.8)
+      activesupport (= 4.2.8)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.2.8)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.9)
+      activesupport (>= 4.2.0, < 5.0)
+      nokogiri (~> 1.6)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    rails-observers (0.1.5)
+      activemodel (>= 4.0)
+    railties (4.2.8)
+      actionpack (= 4.2.8)
+      activesupport (= 4.2.8)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (13.0.3)
+    rb-readline (0.5.5)
+    rbvmomi (2.4.1)
+      builder (~> 3.0)
+      json (>= 1.8)
+      nokogiri (~> 1.5)
+      optimist (~> 3.0)
+    rchardet (1.8.0)
+    recurly (2.18.16)
+    redis (3.3.3)
+    redis-namespace (1.5.3)
+      redis (~> 3.0, >= 3.0.4)
+    responders (2.4.1)
+      actionpack (>= 4.2.0, < 6.0)
+      railties (>= 4.2.0, < 6.0)
+    resque (1.27.4)
+      mono_logger (~> 1.0)
+      multi_json (~> 1.0)
+      redis-namespace (~> 1.3)
+      sinatra (>= 0.9.2)
+      vegas (~> 0.1.2)
+    resque-failed-job-mailer (0.0.3)
+    resque-lonely_job (1.0.2)
+      resque (>= 1.2)
+    resque-retry (1.7.4)
+      resque (>= 1.25, < 3.0)
+      resque-scheduler (~> 4.0)
+    resque-scheduler (4.4.0)
+      mono_logger (~> 1.0)
+      redis (>= 3.3)
+      resque (>= 1.26)
+      rufus-scheduler (~> 3.2)
+    resque_mailer (2.4.3)
+      actionmailer (>= 3.0)
+      activesupport (>= 3.0)
+    rest-client (2.1.0)
+      http-accept (>= 1.7.0, < 2.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.6)
+    ruby-prof (0.15.9)
+    ruby-protocol-buffers (1.2.2)
+    ruby-xz (0.2.3)
+      ffi (~> 1.9)
+      io-like (~> 0.3)
+    rubyzip (1.2.1)
+    rufus-scheduler (3.7.0)
+      fugit (~> 1.1, >= 1.1.6)
+    sanitize (5.2.3)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.8.0)
+      nokogumbo (~> 2.0)
+    sendgrid (1.2.4)
+      json
+    sendgrid_toolkit (1.4.0)
+      httparty (>= 0.7.6)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+    simplecov-rcov (0.2.3)
+      simplecov (>= 0.4.1)
+    sinatra (1.4.8)
+      rack (~> 1.5)
+      rack-protection (~> 1.4)
+      tilt (>= 1.3, < 3)
+    sprockets (3.6.3)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.2)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    stripe (5.29.0)
+    stud (0.0.23)
+    sys-uname (1.2.2)
+      ffi (~> 1.1)
+    thor (1.1.0)
+    thread_safe (0.3.6)
+    tilt (2.0.10)
+    tzinfo (1.2.9)
+      thread_safe (~> 0.1)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.7)
+    uuidtools (2.1.2)
+    vegas (0.1.11)
+      rack (>= 1.0.0)
+    warden (1.2.7)
+      rack (>= 1.0)
+    will_paginate (3.3.0)
+    xml-simple (1.1.8)
+    xmlrpc (0.3.1)
+    zip-codes (0.2.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  aasm
+  actionmailer (= 4.2.8)
+  actionpack (= 4.2.8)
+  activerecord (= 4.2.8)
+  amqp
+  auto_strip_attributes (= 2.6.0)
+  aws-sdk (~> 1)
+  bcrypt (= 3.1.13)
+  bugsnag (= 5.3.2)
+  carrierwave (= 0.11.2)
+  cause
+  cucumber
+  database_cleaner
+  devise (= 3.3.0)
+  elasticsearch
+  em-websocket (>= 0.4.0)
+  email_validator (= 1.6.0)
+  evented-spec
+  factory_girl
+  faraday (= 0.9.2)
+  fog
+  fog-brightbox (= 0.11.0)
+  fpm
+  geokit
+  geokit-rails
+  icalendar (= 2.4.0)
+  iso-639
+  jam_ruby!
+  jampb!
+  kickbox
+  language_list
+  logging
+  mime-types (= 1.25.1)
+  mimemagic!
+  netaddr (= 1.5.1)
+  newrelic_rpm
+  nokogiri (= 1.10.10)
+  oj (= 3.1.3)
+  pg (= 0.17.1)
+  postgres-copy
+  postgres_ext
+  protected_attributes
+  pry
+  rails-observers
+  rb-readline
+  recurly (= 2.18.16)
+  redis (= 3.3.3)
+  redis-namespace (= 1.5.3)
+  resque
+  resque-failed-job-mailer
+  resque-lonely_job (~> 1.0.0)
+  resque-retry
+  resque_mailer
+  rest-client
+  rspec (= 2.14.1)
+  ruby-prof (= 0.15.9)
+  ruby-protocol-buffers (= 1.2.2)
+  rubyzip (= 1.2.1)
+  sanitize
+  sendgrid
+  sendgrid_toolkit (>= 1.1.1)
+  simplecov (~> 0.7.1)
+  simplecov-rcov
+  sprockets (= 3.6.3)
+  stripe
+  uuidtools (= 2.1.2)
+  will_paginate
+  zip-codes
+
+RUBY VERSION
+   ruby 2.4.1p111
+
+BUNDLED WITH
+   1.17.3
diff --git a/websocket-gateway/Gemfile.lock b/websocket-gateway/Gemfile.lock
index cd6f896f0..a546264c8 100644
--- a/websocket-gateway/Gemfile.lock
+++ b/websocket-gateway/Gemfile.lock
@@ -11,10 +11,9 @@ PATH
 GEM
   remote: http://rubygems.org/
   remote: https://jamjam:blueberryjam@int.jamkazam.com/gems/
-  remote: https://int.jamkazam.com/gems/
   specs:
     CFPropertyList (2.3.6)
-    aasm (5.1.1)
+    aasm (5.2.0)
       concurrent-ruby (~> 1.0)
     actionmailer (4.2.8)
       actionpack (= 4.2.8)
@@ -58,7 +57,7 @@ GEM
       amq-protocol (>= 2.2.0)
       eventmachine
     arel (6.0.4)
-    arr-pm (0.0.10)
+    arr-pm (0.0.11)
       cabin (> 0)
     auto_strip_attributes (2.6.0)
       activerecord (>= 4.0)
@@ -67,7 +66,7 @@ GEM
     aws-sdk-v1 (1.67.0)
       json (~> 1.4)
       nokogiri (~> 1)
-    backports (3.20.2)
+    backports (3.23.0)
     bcrypt (3.1.13)
     bugsnag (5.3.2)
     builder (3.2.4)
@@ -79,11 +78,9 @@ GEM
       mime-types (>= 1.16)
       mimemagic (>= 0.3.0)
     cause (0.1)
-    childprocess (0.9.0)
-      ffi (~> 1.0, >= 1.0.11)
     clamp (1.0.1)
     coderay (1.1.3)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.10)
     crass (1.0.6)
     cucumber (4.1.0)
       builder (~> 3.2, >= 3.2.3)
@@ -135,22 +132,22 @@ GEM
     elasticsearch-transport (7.4.0)
       faraday
       multi_json
-    em-websocket (0.5.2)
+    em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
-      http_parser.rb (~> 0.6.0)
+      http_parser.rb (~> 0)
     email_validator (1.6.0)
       activemodel
     erubis (2.7.0)
-    et-orbi (1.2.4)
+    et-orbi (1.2.7)
       tzinfo
     evented-spec (0.9.0)
     eventmachine (1.2.7)
-    excon (0.79.0)
+    excon (0.92.3)
     factory_girl (4.9.0)
       activesupport (>= 3.0.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    ffi (1.12.2)
+    ffi (1.15.5)
     fission (0.5.0)
       CFPropertyList (~> 2.2)
     fog (1.41.0)
@@ -243,7 +240,7 @@ GEM
     fog-json (1.2.0)
       fog-core
       multi_json (~> 1.10)
-    fog-local (0.6.0)
+    fog-local (0.8.0)
       fog-core (>= 1.27, < 3.0)
     fog-openstack (0.3.10)
       fog-core (>= 1.45, <= 2.1.0)
@@ -290,44 +287,42 @@ GEM
     fog-voxel (0.1.0)
       fog-core
       fog-xml
-    fog-vsphere (3.5.0)
+    fog-vsphere (3.5.1)
       fog-core
       rbvmomi (>= 1.9, < 3)
     fog-xenserver (1.0.0)
       fog-core
       fog-xml
       xmlrpc
-    fog-xml (0.1.3)
+    fog-xml (0.1.4)
       fog-core
       nokogiri (>= 1.5.11, < 2.0.0)
-    formatador (0.2.5)
-    fpm (1.12.0)
-      arr-pm (~> 0.0.10)
+    formatador (0.3.0)
+    fpm (1.14.2)
+      arr-pm (~> 0.0.11)
       backports (>= 2.6.2)
       cabin (>= 0.6.0)
-      childprocess (< 1.0.0)
       clamp (~> 1.0.0)
-      ffi (~> 1.12.0)
       git (>= 1.3.0, < 2.0)
       json (>= 1.7.7, < 3.0)
       pleaserun (~> 0.0.29)
-      ruby-xz (~> 0.2.3)
+      rexml
       stud
-    fugit (1.4.2)
-      et-orbi (~> 1.1, >= 1.1.8)
+    fugit (1.5.3)
+      et-orbi (~> 1, >= 1.2.7)
       raabro (~> 1.4)
     geokit (1.13.1)
     geokit-rails (2.3.2)
       geokit (~> 1.5)
       rails (>= 3.0)
-    git (1.8.1)
+    git (1.11.0)
       rchardet (~> 1.8)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     http-accept (1.7.0)
-    http-cookie (1.0.3)
+    http-cookie (1.0.5)
       domain_name (~> 0.5)
-    http_parser.rb (0.6.0)
+    http_parser.rb (0.8.0)
     httparty (0.16.2)
       multi_xml (>= 0.5.2)
     i18n (0.9.5)
@@ -335,7 +330,6 @@ GEM
     icalendar (2.4.0)
     inflecto (0.0.2)
     insist (1.0.0)
-    io-like (0.3.1)
     ipaddress (0.8.3)
     iso-639 (0.3.5)
     json (1.8.6)
@@ -344,9 +338,10 @@ GEM
       json (>= 1.8)
     language_list (1.2.1)
     little-plugger (1.1.4)
-    logging (1.7.2)
-      little-plugger (>= 1.1.3)
-    loofah (2.9.0)
+    logging (2.3.1)
+      little-plugger (~> 1.1)
+      multi_json (~> 1.14)
+    loofah (2.18.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -354,29 +349,31 @@ GEM
     method_source (1.0.0)
     middleware (0.1.0)
     mime-types (1.25.1)
-    mimemagic (0.3.5)
-    mini_mime (1.0.2)
+    mimemagic (0.3.10)
+      nokogiri (~> 1)
+      rake
+    mini_mime (1.1.2)
     mini_portile2 (2.4.0)
-    minitest (5.14.3)
-    mono_logger (1.1.0)
+    minitest (5.15.0)
+    mono_logger (1.1.1)
     multi_json (1.15.0)
     multi_test (0.1.2)
     multi_xml (0.6.0)
-    multipart-post (2.1.1)
+    multipart-post (2.2.3)
     mustache (0.99.8)
     netaddr (1.5.1)
     netrc (0.11.0)
-    newrelic_rpm (6.15.0)
+    newrelic_rpm (8.8.0)
     nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
-    nokogumbo (2.0.4)
+    nokogumbo (2.0.5)
       nokogiri (~> 1.8, >= 1.8.4)
     oj (3.1.3)
     optimist (3.0.1)
     orm_adapter (0.5.0)
     pg (0.17.1)
     pg_array_parser (0.0.9)
-    pleaserun (0.0.31)
+    pleaserun (0.0.32)
       cabin (> 0)
       clamp
       dotenv
@@ -398,7 +395,7 @@ GEM
       middleware
       thor
       thread_safe
-    pry (0.13.1)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     raabro (1.4.0)
@@ -418,13 +415,13 @@ GEM
       bundler (>= 1.3.0, < 2.0)
       railties (= 4.2.8)
       sprockets-rails
-    rails-deprecated_sanitizer (1.0.3)
+    rails-deprecated_sanitizer (1.0.4)
       activesupport (>= 4.2.0.alpha)
     rails-dom-testing (1.0.9)
       activesupport (>= 4.2.0, < 5.0)
       nokogiri (~> 1.6)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.3.0)
+    rails-html-sanitizer (1.4.3)
       loofah (~> 2.3)
     rails-observers (0.1.5)
       activemodel (>= 4.0)
@@ -433,7 +430,7 @@ GEM
       activesupport (= 4.2.8)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (13.0.3)
+    rake (13.0.6)
     rb-readline (0.5.5)
     rbvmomi (2.4.1)
       builder (~> 3.0)
@@ -457,14 +454,14 @@ GEM
     resque-failed-job-mailer (0.0.3)
     resque-lonely_job (1.0.2)
       resque (>= 1.2)
-    resque-retry (1.7.4)
+    resque-retry (1.7.6)
       resque (>= 1.25, < 3.0)
       resque-scheduler (~> 4.0)
-    resque-scheduler (4.4.0)
+    resque-scheduler (4.5.0)
       mono_logger (~> 1.0)
       redis (>= 3.3)
-      resque (>= 1.26)
-      rufus-scheduler (~> 3.2)
+      resque (>= 1.27)
+      rufus-scheduler (~> 3.2, < 3.7)
     resque_mailer (2.4.3)
       actionmailer (>= 3.0)
       activesupport (>= 3.0)
@@ -473,6 +470,7 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
+    rexml (3.2.5)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
@@ -483,11 +481,8 @@ GEM
     rspec-mocks (2.14.6)
     ruby-prof (0.15.9)
     ruby-protocol-buffers (1.2.2)
-    ruby-xz (0.2.3)
-      ffi (~> 1.9)
-      io-like (~> 0.3)
     rubyzip (1.2.1)
-    rufus-scheduler (3.7.0)
+    rufus-scheduler (3.6.0)
       fugit (~> 1.1, >= 1.1.6)
     sanitize (5.2.3)
       crass (~> 1.0.2)
@@ -501,7 +496,7 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
-    simplecov-rcov (0.2.3)
+    simplecov-rcov (0.3.1)
       simplecov (>= 0.4.1)
     sinatra (1.4.8)
       rack (~> 1.5)
@@ -514,26 +509,31 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    stripe (5.29.0)
+    stripe (6.4.0)
     stud (0.0.23)
     sys-uname (1.2.2)
       ffi (~> 1.1)
-    thor (1.1.0)
+    thor (1.2.1)
     thread_safe (0.3.6)
     tilt (2.0.10)
     tzinfo (1.2.9)
       thread_safe (~> 0.1)
+    tzinfo-data (1.2022.1)
+      tzinfo (>= 1.0.0)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.7)
+    unf_ext (0.0.8.2)
     uuidtools (2.1.2)
     vegas (0.1.11)
       rack (>= 1.0.0)
     warden (1.2.7)
       rack (>= 1.0)
-    will_paginate (3.3.0)
-    xml-simple (1.1.8)
-    xmlrpc (0.3.1)
+    webrick (1.7.0)
+    will_paginate (3.3.1)
+    xml-simple (1.1.9)
+      rexml
+    xmlrpc (0.3.2)
+      webrick
     zip-codes (0.2.1)
 
 PLATFORMS
@@ -573,7 +573,7 @@ DEPENDENCIES
   language_list
   logging
   mime-types (= 1.25.1)
-  mimemagic!
+  mimemagic (~> 0.3.5)
   netaddr (= 1.5.1)
   newrelic_rpm
   nokogiri (= 1.10.10)
@@ -605,6 +605,7 @@ DEPENDENCIES
   simplecov-rcov
   sprockets (= 3.6.3)
   stripe
+  tzinfo-data
   uuidtools (= 2.1.2)
   will_paginate
   zip-codes
diff --git a/websocket-gateway/build b/websocket-gateway/build
index 8c4e89e0a..bb6353eab 100755
--- a/websocket-gateway/build
+++ b/websocket-gateway/build
@@ -29,7 +29,7 @@ bundle list
 #rm -rf vendor/bundle -- let checkins config 'wipe workspace' decide this
 echo "updating dependencies"
 
-bundle install --path vendor/bundle
+bundle _1.17.3_ install --path vendor/bundle
 #bundle update
 
 
diff --git a/websocket-gateway/config/application.yml b/websocket-gateway/config/application.yml
index afb18f5af..8ca648d04 100644
--- a/websocket-gateway/config/application.yml
+++ b/websocket-gateway/config/application.yml
@@ -18,20 +18,20 @@ development:
   port: 6767
   verbose: true
   emwebsocket_debug: false
-  rabbitmq_host: 127.0.0.1
+  rabbitmq_host: rabbitmq
   rabbitmq_port: 5672
   <<: *defaults
 
 test:
   port: 6759
   verbose: true
-  rabbitmq_host: 127.0.0.1
+  rabbitmq_host: rabbitmq
   rabbitmq_port: 5672
   <<: *defaults
 
 production:
   port: 6767
   verbose: false
-  rabbitmq_host: 127.0.0.1
+  rabbitmq_host: rabbitmq
   rabbitmq_port: 5672
   <<: *defaults
diff --git a/websocket-gateway/config/database.yml b/websocket-gateway/config/database.yml
index 435b92b3f..75d100dfc 100644
--- a/websocket-gateway/config/database.yml
+++ b/websocket-gateway/config/database.yml
@@ -1,32 +1,30 @@
-test:
-  adapter: postgresql
-  database: jam_websockets_test
-  host: localhost
-  port: 5432
-  pool: 3
-  username: postgres
-  password: postgres
-  timeout: 2000
-  encoding: unicode
-
 development:
   adapter: postgresql
   database: jam
-  host: localhost
-  port: 5432
-  pool: 3
   username: postgres
   password: postgres
-  timeout: 2000
-  encoding: unicode
+  host: database
+  pool: 5
+  timeout: 5000
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  adapter: postgresql
+  database: jam_web_test
+  username: postgres
+  password: postgres
+  host: database
+  pool: 5
+  timeout: 5000
+  min_messages: warning
 
 production:
   adapter: postgresql
   database: jam
-  host: localhost
-  port: 5432
-  pool: 3
   username: postgres
   password: postgres
-  timeout: 2000
-  encoding: unicode
+  host: database
+  pool: 5
+  timeout: 5000
\ No newline at end of file