规范代码
Merge branch 'master' of https://github.com/ecomfe/zrender

Conflicts:
	src/shape/base.js