Added favicon.
Merge branch 'dev'