Use the sugar API to set the colors of the activity icon
Merge branch 'master' into gh-pages