add favicon
merge shawn into master