Fixed rollup manager visualization
Fixed rollup team typos
Merge branch 'hitdea' into develop
Merge branch 'develop'