bugfix
Merge branch 'favicon'