Adding basic support for favicon
Merge commit '10ef7ceceb11a0c26ca91b6f0ffc43cb4201c290'