Merge branch 'hotfix/6.0.6'

* hotfix/6.0.6:
  * Fixed Rails version number
* Updated gems
Merge branch 'hotfix/6.0.7' into develop

* hotfix/6.0.7:
  * Updated gems