Merge branch 'hotfix/0.9.4'

* hotfix/0.9.4:
  * Deploy with ruby 2.0.0-p353 * Updated gems
* Rails 3.2.16
* Updated gems
Merge branch 'hotfix/0.9.5' into develop

* hotfix/0.9.5:
  * Rails 3.2.16 * Updated gems