Merge branch 'hotfix/4.0.3'

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

* hotfix/4.0.4:
  * Updated gems * Bootstrap for Sass 3.1.1