Set versions based on npm install --save
Merge remote-tracking branch 'upstream/master'

Conflicts:
	package.json