Add Favicon
Merge branch '2.0.4'