Merge branch 'hotfix/0.9.10'

* hotfix/0.9.10:
  * Updated gems * update ruby for CVE-2013-6393
* Rails 3.2.17
* Updated gems
Merge branch 'hotfix/0.9.11' into develop

* hotfix/0.9.11:
  * Rails 3.2.17 * Updated gems