Merge branch 'master' of https://github.com/lb1064/yhd-spriter

Conflicts:
	package.json
Merge branch 'master' of https://github.com/lb1064/yhd-spriter