Merge branch 'dev-refactor'

Conflicts:
	package.json
merge from upstream
update branch
﻿删除多余的文件
Merge pull request #159 from jianling/master

删除多余的文件