Update Favicon
Merge branch 'dev'