added combo bar
Merge branch 'Jordan' into Mitch