Merge branch 'hotfix/4.0.4'

* hotfix/4.0.4:
  * Updated gems * Bootstrap for Sass 3.1.1
* Rails 4.0.3
* Updated gems
Merge branch 'hotfix/4.0.5' into develop

* hotfix/4.0.5:
  * Rails 4.0.3 * Updated gems