added favicon
done loading
Merge branch 'resource_loading' into core
Merge branch 'core'