Merge branch 'hotfix/0.13.3'

* hotfix/0.13.3:
  * Rails 3.2.19 * Updated gems
* Updated gems
Merge branch 'hotfix/0.13.4' into develop

* hotfix/0.13.4:
  * Updated gems