Merge branch 'hotfix/6.0.2'

* hotfix/6.0.2:
  * Using SCSS Syntax * Updated gems
* Fixed changelog
* Updated gems
Merge branch 'hotfix/6.0.3' into develop

* hotfix/6.0.3:
  * Fixed changelog * Updated gems