merge new favicon to master