changed favicon
merge from dev
publish