fixed
Merge branch 'hotfix/fix-favico'