Merge remote-tracking branch 'release/master'

Conflicts:
	README.md
	package.json
	server.js