Merge branch 'master' into dev
Añadimos Favicons.
Merge branch 'dev'