Added macro constants for spinner colors
Merge remote-tracking branch 'origin/master'