Merge branch 'hotfix/4.0.9'

* hotfix/4.0.9:
  * Rails 4.0.4 * Updated gems
* Updated gems
Merge branch 'hotfix/4.0.10' into develop

* hotfix/4.0.10:
  * Updated gems