Changed routes in HTML files and favicon declaration.
Merge branch 'master' into gh-pages