changed favicon
merge from dev