web services
Merge remote-tracking branch 'origin/master'

Conflicts:
	node.js/web-services/server.js
Merge remote-tracking branch 'origin/master'
web services express