Merge branch 'hotfix/2.8.2'

* hotfix/2.8.2:
  * Improved tests
* Improved glyphicons paths
Merge branch 'hotfix/2.8.3' into develop

* hotfix/2.8.3:
  * Improved glyphicons paths