* Added basic npm project
* Merged branch 'develop' into staging