Merge branch 'master' into production
Hotfix, fix favicon path
Merge branch 'production'