changed npm in package
Merge branch 'develop' into staging