提交改动
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