put favicon in correct place
Remove old favicon
Merge branch 'dev'