Merge branch 'hotfix/2.3.5'

* hotfix/2.3.5:
  Updated gems
* Deploy with ruby 2.0.0-p353
* Updated gems
Merge branch 'hotfix/2.3.6' into develop

* hotfix/2.3.6:
  * Deploy with ruby 2.0.0-p353 * Updated gems