fix package.json
Merge branch 'master' into dev
change package.json
Merge branch 'dev'