Adding favicon
Adding favicon
Merge branch 'master' into gh-pages