fixed package.json
Merge branch 'dev'