added favIcon
merge