Added favicon
Merge branch 'develop' into staging