added favicon link in head, updated favicon
Merge branch 'staging' into gh-pages
changed base url back