Add missing NPM properties
fix conflicts in package.json
Merge remote-tracking branch 'origin/master'