Merge
Merge.
Fixed progbar color.