添加饼图，升级组件等
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	build.js