Update README.md
Merge branch 'master' into node_soap

Conflicts:
	README.md