added favicon
merge from dev