Merge branch 'hotfix/2.0.1_sass-mixins-bugfix'
- added touch icons and favicon
Merge branch 'hotfix/2.0.2' into develop