w
Merge branch 'master' of https://github.com/hejiehui/xState.git

Conflicts:
	com.xross.tools.xstate.editor/.gitignore