Merge branch 'hotfix/6.1.5'

* hotfix/6.1.5:
  * Updated gems
Merge branch 'release/7.0.0'

* release/7.0.0:
  fixed previous merge [ci skip]
  Fixed newrelic config Improved GC [ci skip]
  removed db:setup from app.json [ci skip]
  Fixed readme [ci skip]
  * Support for app.json * Updated gems [ci skip]
  * Support for app.json * Updated gems
Merge branch 'release/7.1.0'

* release/7.1.0:
  Updated gems
  Migrating to spec 3. Waiting for capybara
* Updated gems
Merge branch 'hotfix/7.1.1' into develop

* hotfix/7.1.1:
  * Updated gems