Merge branch 'hotfix'
added flickr icon
Merge branch 'hotfix' into develop