a
Merge branch 'master' of https://github.com/putaoshu/jdf

Conflicts:
	package.json
a
a
Merge branch 'master' of https://github.com/putaoshu/jdf
repare the bug: delete not empty directory when building
a