Merge branch 'develop'
added icon attribution
Merge branch 'master' into develop