commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	cloud/app.js
commit
Merge remote-tracking branch 'origin/master'
commit
Merge remote-tracking branch 'origin/master'