添加生成carbon aggregation 配置策略文件，添加汉字转换拼音包
添加系统TPCC性能展示
add sydomain graphite view, and time selected and report
Merge branch 'master' into zmcc

Conflicts:
	config/database.yml
	config/indexer.yml
rake update Gemfile