Favicon
Merge branch 'master' into gh-pages
Lots of revisions...