uiactivityindicator fixed
Merge remote-tracking branch 'origin/master'
current streak setup and some coloring code.