Merge branch 'hotfix/icons2'
Move favicon back to app/assets/images.
Merge branch 'hotfix/icons3' into develop