new favicon
Merge branch 'master' into new-favicon
Merge branch 'new-favicon'