Merge remote-tracking branch 'origin/stable'
Updating to use NPM Install
Merge remote-tracking branch 'origin/master' into stable