Added favicon
Merge branch 'master' into web/lbkstudios/32