Added more fields to the package.json.
Merge branch 'master' into PouchDB

Conflicts:
	package.json