GEM:1 favicon change
Merge branch 'web/fluent/1' into dev