refactor
update metadata
Merge remote-tracking branch 'origin/master' into temp

Conflicts:
	package.json
	sort-object.js
	test/test.js
fix merge conflicts
Merge branch 'temp'