[test]color用例去掉多余字符
Merge remote-tracking branch 'remotes/hancong/dev' into dev
[demo]
[demo]修改demo.html
Merge branch 'dev' of https://github.com/techird/kitygraph into dev
[demo]
conf
Merge branch 'dev' of https://github.com/yancend/kitygraph into dev
karma.conf.js
karma.conf.js
karma
karma
Merge remote-tracking branch 'remotes/techird/dev' into dev

Conflicts:
	src/graphic/paper.js
example
karma
karma
testconfig
config
testconfig
testconfig