Added favicon.
Updated favicon.
Merge branch 'master' into gh-pages