update package.json node and npm ver
Merge remote-tracking branch 'origin/master'