Added favicon
Merge branch 'favicon'