add feature that report can aggretate based on rules
Merge branch 'biz' of https://github.com/dianping/cat into biz
Merge pull request #70 from youyong205/biz

big refactor
Merge pull request #72 from youyong205/biz

version 0.6.0 for release
merge
Merge branch 'biz' of https://github.com/dianping/cat into biz
Merge pull request #77 from sunryuan/biz

aggregate frontend problem
refactor aggregation module