fixed
started work on combo counter
beforeMerger
Merge branches 'latestBuild' and 'clusterRefactor' into latestBuild