Merge branch 'develop'
Move favicon into proper place.
Merge branch 'hotfix/favicon'
Merge branch 'hotfix/favicon' into develop
Comment out icons for other devices for now.
Merge branch 'hotfix/icons' into develop