add an icon
Merge branch 'staging' -- development changes look good
Merge branch 'master' into develop