datacloud work
Merge remote-tracking branch 'origin/master'

Conflicts:
	datacloud/index.js