Merge branch 'production'
Fix favicon path
Merge branch 'master' into production