Added Cardinality aggregation
Fixed test for Cardinality aggregation
Added Cardinality aggregator to changes
Merge pull request #581 from r1pp3rj4ck/cardinality

Cardinality aggregation