Merge branch 'master' into develop

:twisted_rightwards_arrows: Merge master :twisted_rightwards_arrows: Merge origin/develop, keeping master's Gemfile.lock and Procfile.dev :arrow_up: Upgrade packages :wrench: Remove jobs from proc file