Merge branch 'hotfix/0.13.4'

* hotfix/0.13.4:
  * Updated gems
* Updated gems
* Fixed issues with Bootstrap 3.2.0
Merge branch 'hotfix/0.13.5' into develop

* hotfix/0.13.5:
  * Updated gems * Fixed issues with Bootstrap 3.2.0