Merge branch 'hotfix/0.13.5'

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

* hotfix/0.13.6:
  * Updated gems * Improved code