Merge branch 'master' into develop -- add that icon
Merge branch 'develop' of github.com:trjh/bitstarter into develop