Merge branch 'hotfix/0.9.5'

* hotfix/0.9.5:
  * Rails 3.2.16 * Updated gems
* Updated gems
Merge branch 'hotfix/0.9.6' into develop

* hotfix/0.9.6:
  * Updated gems