added favicon.ico
Merge branch 'develop'