Merge branch 'master' into work
update favicon
Merge branch 'work'