modify the code format
modify the pie chart default size
Merge branch 'master' of github.com:dianping/cat
modify the problem pie chart
fix the group show problem
fix history problem bug
fix the js
modify the cat
modify the jsp page
Merge pull request #323 from youyong205/master

modify js error
resolve conflicts