Merge branch 'hotfix/2.3.7'

* hotfix/2.3.7:
  * Updated gems
* Rails 3.2.16
* Updated gems
Merge branch 'hotfix/2.3.8' into develop

* hotfix/2.3.8:
  * Rails 3.2.16 * Updated gems