Added engines to package.json
Merge branch 'dev'