Added favicon
Merge branch 'develop'