Merge pull request #1 from fsiaonma/master

提交代码
Merge pull request #2 from fsiaonma/master

提交代码
提交改动
Merge branch 'master' of git@github.com:TingoZhou/x-canvas-tmp.git

Conflicts:
	src/lib/createjs/soundjs/HTMLAudioPlugin.js
	src/lib/createjs/soundjs/Sound.js
	src/lib/createjs/soundjs/WebAudioPlugin.js
Merge pull request #1 from TingoZhou/master

同步