Update package.json
Merge branch 'master' of github.com:natgeo/activitystreams into develop

Conflicts:
	package.json