add favicon
Merge branch 'dev4'