added favicon
merged changes from live server