addinged favicon handling
Merge branch 'develop' into staging