goal progress bar color fixed
font & reward style
Merge remote-tracking branch 'origin/master'