Merge branch 'dev'
Fix path to Favicons.
Merge branch 'master' into dev