resolve for promise
Merge branch 'master' of github.com:eurus/zcb

Conflicts:
	cloud/main.js