README编辑
Merge branch 'master' of https://github.com/terrason/jztree

Conflicts:
	README.md
Merge branch 'master' of https://github.com/terrason/jztree

Conflicts:
	README.md